cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,490 Commits 5 Branches 0 Tags
cbaeb8afafa7059020dfd38b5f938d497fa65601
Commit Graph

9503 Commits

Author SHA1 Message Date
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
Chinsky
4f35f581c0 Merge pull request #2768 from SkyMarshal/bleeding-edge-freeze 
Air alarm fix, atmos control computer fix, item description fix.
 2013-05-15 14:37:07 -07:00
SkyMarshal
6e2879dc74 Made an oopsie 2013-05-15 14:36:32 -07:00
SkyMarshal
88a65b63e4 Fixes air alarms going off if the upper bounds were set to disabled. 
Fixes atmos control computer displaying some air alarms in unreadable yellow
Fixes a text error in item descriptions.
 2013-05-15 14:31:31 -07:00
Mloc
e0f22c9931 Turn off control_freak for profiling and stuff. 2013-05-15 22:52:25 +02:00
Mloc
5b177df027 Merge pull request #2766 from SkyMarshal/bleeding-edge-freeze 
Fixes air alarms freezing station an hour into round.
 2013-05-15 13:29:15 -07:00
SkyMarshal
a1bc5d6cf0 Fixes air alarms freezing station an hour into round. 2013-05-15 13:28:27 -07: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
Laurence Reading
8230214833 Fixed MULEbot pathing 
MULEbot was simply reversing the path before trying to follow it, Also
added a null check.
 2013-05-15 10:34:09 +01:00
Mloc
345c2b1f3c Merge pull request #2752 from CIB/feature 
Improved the command report
 2013-05-14 12:24:09 -07:00
cib
bb06a18c33 Reduced chance for changeling to be listed as suspect. 
Better than discussing this forever.
 2013-05-14 21:12:47 +02:00
Chinsky
6271975700 Merge pull request #2755 from caelaislinn/master 
Xenoarchaeology update
 2013-05-14 07:49:18 -07:00
Cael_Aislinn
749d3eeaa0 transit pods should reverse direction when they reach the end of the tube 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-05-14 13:10:28 +10: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
cib
d12c3f9cf3 Added a missing linebreak. 2013-05-14 00:58:49 +02:00
cib
28b40c3693 New command reports that aren't stupid. 
It will give you a list of suspects, which uses a lot of randomization to gather up anti-NT guys, actual antags, and random people.
 2013-05-14 00:39:29 +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
fauxtada
5b2f03db10 Map Fixes - BEF 
- adjusts the piping and flooring panels in the new security wing.
- fixes the piping around the new eva since they lead to nowhere.
- adjusted the medbay lobby a bit, added a second chair behind the front desk.
- added in a xenos closet. has unathi items / wooden sandals in it currently. still need to sprite up the tajaran and skrell items.
 2013-05-11 09:33:45 -07: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
Mloc
e77e905c00 Merge pull request #2745 from comma/bleeding-edge-freeze 
Sec Wing remap
 2013-05-11 02:18:15 -07:00
Mloc
52583c53b2 Merge pull request #2744 from Spamcat/bef 
fixes
 2013-05-11 02:16:47 -07:00
Ravensdale
754057cd09 hopefully disables glasses, unable to replicate bug. 2013-05-10 17:39:59 -07:00
Chinsky
61cf1b279d Security wing remap. 2013-05-10 16:05:23 +04: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
SkyMarshal
7118add9da Fixes some runtimes as well as a merge-related bug that made heat not transfer through doors. 2013-05-08 11:26:38 -07:00
Spamcat
17269494ef fixed #2737 2013-05-08 15:13:28 +04:00
Spamcat
0decd3b078 Air alarm runtimes. 
fixed #2717
 2013-05-08 15:12:25 +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
849ec5052a Fix for compiling on case sensitive filesystems. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:09:10 +01:00
Mloc-Argent
80e49b830e obligatory whoops! 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-05-06 16:02:26 +01: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
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