cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,691 Commits 8 Branches 0 Tags
037a901b2283018942f425e7347669597d571c4d
Commit Graph

5692 Commits

Author SHA1 Message Date
GinjaNinja32
3c525e907a 'Fixes' NanoUI locking up on medical/security records 2015-06-14 14:44:38 +01:00
mwerezak
ad24805eb8 Mob fire temperature fix, tweaks 
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.

Also made mob fires burn hotter overall and resisting slower.
 2015-06-13 15:45:52 -04:00
PsiOmega
8279cc48d8 mob/living/Life() now handles mutations and radiation. 2015-06-13 19:40:24 +02:00
PsiOmega
06f2009fbf mob/living/Life() now handles environment. 2015-06-13 14:45:13 +02:00
PsiOmega
2760836b15 mob/living/Life() now handles breathing. 2015-06-13 14:43:56 +02:00
PsiOmega
ee88e7b8b4 Base Life-addition() 2015-06-13 13:36:08 +02:00
PsiOmega
24cd59382c Absolute Life paths. 
Changes relative Life paths into absolute to make a potential refactoring easier to manage.
 2015-06-13 11:41:37 +02:00
PsiOmega
57f0a3535c Observers can now only follow hivespeech as long as the speaker uses its real identity or antagHUD is enabled. 2015-06-12 17:19:29 +02:00
PsiOmegaDelta
8c7cbeb093 Ghosts can now follow hivemind speech. 
Ghosts can now follow hivemind speech with the same targets as for normal speech (separate links for mob and eye if any, etc.).
 2015-06-12 15:00:53 +02:00
Zuhayr
cef958cac2 Fixes #9503 2015-06-10 23:14:33 +09:30
Zuhayr
018c3fc2aa Fixes #9517 and #9542 2015-06-10 23:14:33 +09:30
PsiOmegaDelta
7573ef961c Merge remote-tracking branch 'upstream/dev' into 150609-TrackEye 2015-06-10 11:16:34 +02:00
PsiOmegaDelta
75cffd60aa Merge pull request #9780 from Baystation12/dev-freeze 
Dev
 2015-06-10 11:15:45 +02:00
PsiOmegaDelta
b44da1ee42 Admin JMP now includes a link to EYE or BDY if any. 2015-06-10 11:08:31 +02:00
PsiOmegaDelta
e7faa19ea3 Merge pull request #9779 from Baystation12/master 
Dev-freeze.
 2015-06-10 11:04:54 +02:00
PsiOmegaDelta
449c8c8d8f Refactors the ghost_follow_link proc to not use istype checks. 2015-06-10 10:08:17 +02:00
PsiOmegaDelta
e669c1ab7c Merge pull request #9687 from comma/dev 
Fixes organs self-rejecting
 2015-06-10 09:39:43 +02:00
PsiOmegaDelta
1efd3f9394 Merge pull request #9775 from mwerezak/mrowl 
Fixes tajaran name generation, tweaks
 2015-06-10 07:59:10 +02:00
mwerezak
58d512d1e6 Fixes tajaran name generation, tweaks 2015-06-10 00:53:24 -04:00
PsiOmega
6f70049a12 Expanded ghost following. 
Ghosts can now follow the Eye of a speaking mob, if it has one, or the body of someone who has died.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1151.
 2015-06-09 16:36:43 +02:00
PsiOmega
3591bd5599 Travis now builds using version 508.1287 
throw is now a keyword. Updates usages where necessary to allow compilation.
 2015-06-09 15:36:27 +02:00
Zuhayr
73146a62fe Merge pull request #9747 from PsiOmegaDelta/150608-NanoPaths 
NanoUI sources can now be datums instead of atom/movable.
 2015-06-09 20:08:02 +09:30
PsiOmegaDelta
0af1009b50 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-09 12:14:35 +02:00
PsiOmegaDelta
97f49bb982 Merge pull request #9756 from Baystation12/master 
Dev-freeze
 2015-06-09 12:12:40 +02:00
PsiOmega
13cb32fa7f Another MayRespawn() fix. 
Being unable to reenter your body now allows you to respawn, even if your body lives.
 2015-06-08 17:39:25 +02:00
PsiOmegaDelta
20542bf84b NanoUI sources can now be datums instead of atom/movable. 
Also accidentally fixes #7042 as the AI no longer cares about the machinery var.
 2015-06-08 17:06:06 +02:00
Chinsky
364c2dc01a Fixes typo. 2015-06-08 14:23:26 +03:00
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors 
Ports /tg/'s meteors.
 2015-06-08 14:17:57 +03:00
GinjaNinja32
d6677d4389 Merge pull request #9739 from PsiOmegaDelta/150608-NoPowerNoControl 
AI restrictions and rejuvenation.
 2015-06-08 10:08:55 +01:00
PsiOmegaDelta
81ee9178bd Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-06-08 09:57:33 +02:00
PsiOmegaDelta
5d058be2e6 Merge pull request #9741 from Baystation12/master 
Dev-freeze
 2015-06-08 09:56:24 +02:00
PsiOmegaDelta
cad9b59c25 AI restrictions and rejuvenation. 
Ensures the AI cannot use Topics() while unpowered.
Ensures the AI is properly rejuvenated by the AI verb, as a functional AI will now never be lying down.
 2015-06-08 09:10:33 +02:00
Techhead0
9f93abbaf3 Removes Beehive and Pompadours from Unathi hairstyles. 
As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles.
 2015-06-07 12:31:55 -04:00
PsiOmega
26e5734e93 The AI screen now glows. 
With the color depending on the chosen display screen.
 2015-06-07 13:48:32 +02:00
PsiOmega
fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
 2015-06-07 10:51:41 +02:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
PsiOmegaDelta
2e920bce69 Merge pull request #9711 from mwerezak/syringelog 
Syringe gun logs, logging helper reorganization
 2015-06-07 09:00:21 +02:00
Zuhayr
2eb14e037f Merge pull request #9709 from PsiOmegaDelta/150606-GhostSpawn 
Fixes #9685.
 2015-06-07 15:06:09 +09:30
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
PsiOmega
cbead4224b Fixes #9685. 
Observer from the lobby do not have minds, while observers that once lived do.
Re-arranges the MayRespawn() logic to handle these situation.
 2015-06-06 15:44:49 +02:00
PsiOmega
711eb0501c Fixes #9697 
Replaces and closes the <span>
 2015-06-05 21:17:11 +02:00
PsiOmegaDelta
bad9c103eb Merge remote-tracking branch 'upstream/dev' into 150605-Meteors 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
 2015-06-05 14:59:52 +02:00
PsiOmegaDelta
a07d20d657 Ports /tg/'s meteor implementation. 
Merges the two meteor events into one, and now takes severity into consideration instead.
Including the basic meteors there are also new types ranging from flaming to radioactive which may drop appropriate types of ore.
 2015-06-05 14:58:35 +02:00
Chinsky
02d6e7a303 Fixes #9605 
Now organ DNA is sync'd to newly created character.
 2015-06-05 12:49:48 +03:00
Chinsky
026500ea06 Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade 2015-06-05 11:26:25 +03:00
Chinsky
e5a8eb2dfc Actually renames 'going' var. 
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
 2015-06-05 11:07:24 +03:00
Chinsky
dcf7f308f6 Merge pull request #9662 from PsiOmegaDelta/150604-SpiderGlow 
Giant spider nurses now have a chance of injecting their victims with eggs.
 2015-06-05 10:37:58 +03:00
Chinsky
ad0652d864 Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var). 2015-06-04 22:51:15 +03:00
PsiOmegaDelta
55bc495ee7 Some cleanup of code. 2015-06-04 14:18:13 +02:00
PsiOmegaDelta
5006e8160d Spider eggs now also inherit color and light from their mother. 2015-06-04 12:19:54 +02:00