cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,143 Commits 5 Branches 0 Tags
fa36451ec59972ba3ee9b4fc8aa5b34d3d11c97d
Commit Graph

10559 Commits

Author SHA1 Message Date
Zuhayr
fa36451ec5 Merge pull request #3593 from Segrain/master 
Helper fix.
 2013-08-27 19:50:46 -07:00
Zuhayr
00c4859765 Merge pull request #3598 from zylowalsh/Door_Control-Fix 
Update door_control.dm
 2013-08-27 19:50:22 -07:00
Philip
66071c81ba Update door_control.dm 
The var desiredstate doesn't update when the airlock closes automatically and so most of the time players have to hit the button twice. This keeps all functionality but with one button press.
 2013-08-27 16:38:07 -06:00
Erthilo
7a319904e4 Reverts gender checks as it was breaking with NEUTER and breaking facial hair. 2013-08-27 22:51:24 +01:00
Segrain
19db0df4b5 Fix for hiding cyborgs from upload console. 2013-08-27 19:50:35 +03:00
Segrain
e85ddd3b9a Fix for unisex hairstyles. 2013-08-25 09:27:05 +03:00
Zuhayr
a5f79057d1 Merge pull request #3585 from Segrain/master 
Hairfix.
 2013-08-24 22:50:36 -07:00
Kilakk
86d709e150 Fixed medical HUDs not being able to set SSD status correctly 2013-08-24 23:52:00 -04:00
Kilakk
e634cd01f2 Fixes #3517 2013-08-23 14:21:08 -04:00
Segrain
5f8c8d9cce Fix for negative damage. 2013-08-23 15:33:51 +03:00
Segrain
245d33c1af Fix for invisible wounds. 2013-08-23 15:32:37 +03:00
Segrain
40909bde53 Deconstruction fix. 2013-08-23 15:31:37 +03:00
Segrain
cd2922cebe Name fix. 2013-08-23 15:30:49 +03:00
Segrain
acb4a01b9d Compile fix. 2013-08-23 10:42:29 +03:00
Zuhayr
3c139df703 Merge pull request #3569 from Mloc/hairfix 
Small fixes to hair.
 2013-08-22 22:48:11 -07:00
Mloc-Argent
1106845cb6 further checks against mobs being loaded by hydraulic clamps. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-22 15:54:28 +01:00
Mloc
e20f2e1409 Small fixes to hair. 
Hair styles that aren't designed to have color shifts will no longer be affected.
Balding virus symptom now only applies to humans.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-08-22 15:12:59 +01:00
Segrain
57c1a9a556 Code cleanup. 2013-08-22 10:11:49 +03:00
Mloc-Argent
5cee2d2ac2 Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles. 2013-08-21 23:26:59 +01:00
Mloc
29d4b9e422 Merge pull request #3561 from Erthilo/master 
Fixes, emotes, books
 2013-08-21 04:14:50 -07:00
Erthilo
d7fc84b42b Better gender checks. 2013-08-21 09:59:07 +01:00
Erthilo
d3775875df Revert "Experimentally readding Delete Book verb." 
This reverts commit ec3000ecfb.
 2013-08-21 09:10:21 +01:00
Mloc-Argent
c188e46efc Removes alien virus. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-20 21:54:37 +01:00
Erthilo
13caefe138 Uncomments Space Law book content. 2013-08-20 14:20:46 +01:00
Erthilo
b6900d50fc Fixes admins not spawning as aliens on roundstart. 2013-08-20 14:20:33 +01:00
Erthilo
16d9b76599 Allow all mobs to emote. Standardising emote proc. 2013-08-20 10:38:57 +01:00
Erthilo
ec3000ecfb Experimentally readding Delete Book verb. 2013-08-20 10:37:57 +01:00
Erthilo
de6eb16e1a Fixes being able to have alien species hair on humans or other species. 2013-08-20 10:37:05 +01:00
Mloc
de79aa733b More dismemberment fixes 
More elegant solution to gasping torsos.
Applying damage to torso will no longer gib everything connected to it.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-08-20 02:06:56 +01:00
Mloc-Argent
b2a3405f80 Two fixes for dismemberment. 
Species dismemberment now creates the correctly textured gibs.
Decapitation now kills you.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-19 23:49:53 +01:00
Segrain
71e52b57fe Fix for #3552. 2013-08-19 23:25:03 +03:00
Segrain
18b26c57b7 Inertia fix. 2013-08-19 13:05:52 +03:00
Segrain
cd4eaecf21 Fix for #3549. 2013-08-19 13:05:00 +03:00
Chinsky
4262e6b6bc Merge pull request #3547 from Zuhayr/master 
Borer prompt, dionaea fix
 2013-08-19 01:27:11 -07:00
Zuhayr
67f3f5a3c4 Podmen prompt/spawn should work now. 2013-08-19 15:58:08 -07:00
Zuhayr
809c17710d Borer prompt will now actually work without runtimes. 2013-08-19 15:46:40 -07:00
Zuhayr
320a009e2d Made Dionaea whitelisted. 2013-08-19 12:38:48 -07:00
Zuhayr
6d8bb8dfe6 Hopefully a fix for Dionaea weirdness regarding pods. 2013-08-19 11:53:24 -07:00
Zuhayr
e05976e1b9 Confirmation prompt for borers. 2013-08-19 11:53:03 -07:00
Kilakk
abe170e006 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	baystation12.dme
 2013-08-19 00:27:28 -04:00
Kilakk
83bc47a47e Temporary fix for #3543, gave bees an icon_dead state 
* Also, possibly stopped bees from moving around while deceased (in this case, while not having stat CONSCIOUS)
* Bees don't have an actual death icon, just a placeholder bees1 for now
 2013-08-18 23:47:11 -04:00
Kilakk
8d2910da37 Bees are simple_animals, not machines. Bluh. 2013-08-18 22:52:39 -04:00
Zuhayr
02b5cdaca3 Merge pull request #3541 from Mloc/dsayfix 
Much more probable fix for deadchat breaking on clientless ghosts.
 2013-08-17 06:18:25 -07:00
Mloc-Argent
404c12f61e Much more probable fix for deadchat breaking on clientless ghosts. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-17 14:18:01 +01:00
Mloc
6ea99aff32 Disabled airlock heat transfer after community vote. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-08-17 01:03:13 +01:00
Mloc-Argent
ebc19424e0 Fix for minute traces of toxins in the air causing firestorms. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-17 00:19:28 +01:00
Segrain
2ea03c0925 Fix for #3535. 2013-08-17 00:26:27 +03:00
Zuhayr
9c58348879 Holodeck exploit fix. 2013-08-17 04:41:28 -07:00
Zuhayr
2bc8212d2a Fix for subtypes of X mob not being able to understand each other. 2013-08-16 19:00:08 -07:00
Zuhayr
8df4c42c63 Merge pull request #3523 from Mloc/dsayfix 
Probable fix for deadchat randomly breaking.
 2013-08-15 17:27:11 -07:00