cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,554 Commits 5 Branches 0 Tags
e2ea94d59c9ddcc06aa52d3bf51384a26e0a27da
Commit Graph

5346 Commits

Author SHA1 Message Date
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00
Chinsky
e197799c46 Fixes #2830 
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
 2013-05-25 13:34:24 +04:00
Chinsky
629022f7b0 Fixes #2836 
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
 2013-05-23 15:06:37 +04:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such. 
That lead to knives bruising people you stab, for example.
 2013-05-22 12:55:15 +04:00
Chinsky
e032e3101d Merge pull request #2811 from caelaislinn/xenoarch 
Xenoarch tweaks
 2013-05-19 04:24:15 -07:00
Cael_Aislinn
7067382f52 hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-19 19:12:42 +10:00
MagmaRam
d7876da147 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	icons/obj/custom_items.dmi
 2013-05-19 06:21:32 +07:00
MagmaRam
fbfa125f4b Bugfix: Fixed issues with custom item camera sprites 
icond/obj/custom_items.dmi: renamed off sprite for blue camera

code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed.

/code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites
 2013-05-18 22:00:15 +07:00
faux
6e85a3ed42 Master Bug Fixes 
- Fixes wall under maintenance tunnel door.
- Fixes AAAAHHHHHHHRRG psych office pressure issue.
- Fixes some names and DMIs on some items. (in theory)
 2013-05-18 05:57:21 -07:00
fauxtada
e932ac76b1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/custom_items.dmi
	maps/tgstation.2.1.0.0.1.dmm
 2013-05-18 04:56:40 -07:00
Chinsky
5f8b7db6bd Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-17 07:35:21 +04:00
Chinsky
7b723bfb82 Merge pull request #2762 from Baystation12/bleeding-edge-freeze 
BEF merge [waitabit]
 2013-05-16 18:30:10 -07:00
Jamini
5b14c5081c Adjustment 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-05-16 21:26:26 -04:00
Jamini
d2c9f11b4f Fixed a disposals bug. Playing with the big garbage pipes is now stupid again. 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-05-16 21:10:03 -04:00
Chinsky
ee374d69c0 Merge pull request #2774 from Roaper/master 
Hey Hey Hey! got it to work! Look at me now mah!
 2013-05-16 10:46:04 -07:00
Mloc
98a12ad82b Fixed up BrokenInHands a little. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 13:05:23 +01:00
Mloc
5faabba7fb Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-05-16 12:21:55 +01:00
Mloc
566454b4c2 gave debuggers proccall back 2013-05-16 12:35:59 +02:00
Ian O'Malley
5039828944 4th times the charm. 
Added some stuff onto code/modules/events/money_spam.dm
Added some stuff onto code/modules/flufftext/Dreaming.dm

Signed-off-by: Ian O'Malley <roaperable@gmail.com>
 2013-05-15 15:55:58 -07:00
Mloc
e0f22c9931 Turn off control_freak for profiling and stuff. 2013-05-15 22:52:25 +02:00
Spamcat
0fb651e873 Fixed glasses 
Fixes #2742
 2013-05-16 00:11:57 +04:00
Chinsky
917ce079ab Merge pull request #2763 from fauxki/bleeding-edge-freeze 
Quick Fixes - BEF
 2013-05-15 11:35:15 -07:00
fauxtada
2b9130b00f Quick Fixes 
- Changed access to security washroom so detective can go in.
- Removed wall that was under maintence tunnel door.
- Fixed writerer's custom item. AGAIN. .. Because they can't decide what character they want it on.
- Added saloon dress to bar closet.
 2013-05-15 11:26:26 -07:00
Chinsky
15b00b733d Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-15 20:13:35 +04:00
Chinsky
6271975700 Merge pull request #2755 from caelaislinn/master 
Xenoarchaeology update
 2013-05-14 07:49:18 -07:00
Cael_Aislinn
23affb99bf cleaned up some tools issues with w_class, depth scanners now reveal the reagent a find responds to (meaning lab analysis can be skipped) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:09:48 +10:00
Cael_Aislinn
6d03802c75 reduced the chance of safely extracting xenoarch finds without the proper process 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:08:30 +10:00
Cael_Aislinn
da9ad69983 made hyperspectral analysis images into a client-side resource 2013-05-14 13:07:11 +10:00
Cael_Aislinn
f021f69e9b cleanup and standardisation of xenoarchaeology analysis machinery 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:06:29 +10:00
cib
ad6105b380 Merge remote-tracking branch 'main/master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-05-14 01:29:45 +02:00
Chinsky
c99fec15ef Merge pull request #2748 from SkyMarshal/bleeding-edge-freeze 
Centcom now has sexy uniforms and IDs.  Emag now looks like modified standard ID card again.
 2013-05-13 10:57:53 -07:00
Chinsky
8af44c59f3 Merge pull request #2750 from Asanadas/master 
Bugfix: Fix for bloody hands not occurring.
 2013-05-13 10:56:30 -07:00
Asanadas
b81d0f1234 carnie umm, dunno if you guys have this bug: mobs not getting bloodyhands etc? 
carnie	do a find-all for "//people with TK won't get smeared with blood" without the quotes
carnie	the > on that line should be a <=
carnie	erro's to blame
carnie	Mport provided the fix
Asanadas	if you say so, strange IRC man
 2013-05-12 02:19:56 -04:00
SkyMarshal
697ab3dd7f Centcom now has sexy uniforms and IDs. Emag now looks like modified standard ID card 2013-05-11 03:39:31 -07:00
Ravensdale
754057cd09 hopefully disables glasses, unable to replicate bug. 2013-05-10 17:39:59 -07:00
Chinsky
a9883979ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	code/controllers/voting.dm
 2013-05-10 15:28:32 +04:00
Mloc
c4b9eddcf6 Merge pull request #2741 from Spamcat/master 
Lone fix
 2013-05-07 09:33:43 -07:00
Spamcat
bb962862ca Posibrains should work correctly in spiderbots. 
Fixed the key transfer issue. (#2534)
 2013-05-07 20:08:12 +04:00
Mloc-Argent
0c820277c8 Merge branch 'master' of github.com:Baystation12/Baystation12 into emergency-bef 2013-05-06 15:45:09 +01:00
Mloc-Argent
27759f47df Merged master into BEF. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 15:43:50 +01:00
Mloc
dad4430a55 Merge pull request #2739 from Aranclanos/ServerCrashFix 
Server crash fix.
 2013-05-06 04:38:08 -07:00
Aranclanos
7312807346 Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi 2013-05-05 21:21:09 -03:00
Aranclanos
d762024d68 Fixed the server crash, it was an infinite loop when a revolver spawned in the xenoarcheology. It added bullets (tried, because it didn't work either) over and over nonstop. 
Commented out the sprite selection on the revolvers in the xenoarcheology spawn code, it selected wrong names and they ended up being invisible. Now they will have the default sprite, the black revolver.
 2013-05-05 21:12:15 -03:00
Chinsky
b2ba65001e Runtime fix. IV injecting from empty blood pack caused it. Now not doing a thing if no blood is injected. 2013-05-05 20:24:33 +04:00
Spamcat
02fd487008 Blood type now saves in savefile. 
fixes #2738
 2013-05-04 13:22:21 +04:00
Spamcat
f7f6c682cf Made nearsightedness not consume a fuckton of memory. 
Also it now adds glasses on preview pic.
 2013-05-03 23:58:56 +04:00
Spamcat
203873bef9 Merge branch 'master' of github.com:Baystation12/Baystation12 2013-05-03 21:50:33 +04:00
Cael_Aislinn
bfdeeb4f94 resolved a MySQL statement issue 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-03 13:21:44 +10:00