cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-31 07:56:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,788 Commits 66 Branches 25 Tags
b38922f1633bc5ced370cfbebfde5c266ece2fc7
Commit Graph
3788 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CaelAislinn b38922f163 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-08 18:16:09 +10:00
Albert Iordache e96e8bc19d Moved the definitions of id cards from weapon.dm to weapons/cards_ids.dm 2012-02-08 08:10:15 +02:00
Albert Iordache 1ae02519fc Merge pull request #380 from Abi79/master 
Small code cleanup
 2012-02-07 22:00:56 -08:00
CaelAislinn 22811eaf26 added personal lockers to most departments, balanced job equipment between wardrobe closet and locker, miscellaneous tweaks (including fix to taj whisp/speak, it should work fine now except for radios) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 11:47:07 +10:00
Hawk-v3 3e1e8f43d6 Merge pull request #383 from caelaislinn/master 
replaced missing air pipe
 2012-02-07 12:53:34 -08:00
CaelAislinn 3a60e2100e replaced missing atmos pipe in medbay maintenance 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 06:51:50 +10:00
Tastyfish 374d4cab4b Merge pull request #382 from caelaislinn/master 
fixed screw ai movement across zlevels
 2012-02-07 12:17:37 -08:00
CaelAislinn 09490b8cb0 fixed derpy ai movement. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 06:16:12 +10:00
Albert Iordache 157da8d59b Merge pull request #381 from caelaislinn/master 
replaced missing wire in counselors office
 2012-02-07 11:10:36 -08:00
CaelAislinn 70849af46c replaced missing wire in the counselor's office 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 04:59:34 +10:00
Albert Iordache 7df0181e60 Code cleanup: renamed the ID card's variable "registered" to "registered_name" for better clarity 2012-02-07 20:05:43 +02:00
Albert Iordache a20481062c Cleaned up parts of the code, no other changes 2012-02-07 20:05:42 +02:00
SkyMarshal d26767127e Merge pull request #379 from caelaislinn/master 
autolathe bug fix
 2012-02-07 08:09:41 -08:00
CaelAislinn a9df0e64bf fixed autolathe perma-freeze bug, also fixed some icon states. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-08 02:07:10 +10:00
Miniature a2003c8600 Merge pull request #378 from Miniature/master 
Runtime fixes
 2012-02-07 07:01:17 -08:00
Miniature 22687953fc Another runtime fix, I believe this to originally be caused by the automatic arrival announcement thing not having a source mob 2012-02-08 01:28:55 +10:30
Miniature 6de4139066 Sky, that was there for a reason (fixing horrible runtimes everywhere) 2012-02-08 01:25:02 +10:30
SkyMarshal be9bcd626d Merge pull request #376 from Tastyfish/master 
streamlined copy machine, mainly to not use process()
 2012-02-06 19:59:01 -08:00
Tastyfish b0113eaac9 Merge pull request #375 from caelaislinn/master 
bug / map fixes
 2012-02-06 19:30:51 -08:00
Tastyfish 26bc74b7fd Merge pull request #377 from SkyMarshal/master 
Bugfixes for airlocks, detective manual, some admin command stuff
 2012-02-06 19:30:24 -08:00
SkyMarshal 14743ca3c0 Derp. That would have been dumb. 2012-02-06 20:27:06 -07:00
SkyMarshal e432958ab5 Bugfixes for airlocks 
Added detective work manual, that spawns on top of the detective's computer
Added RadioAlert proc
Added the capability to title the NanoTrasen updates
 2012-02-06 20:24:00 -07:00
CaelAislinn 1366bf7e34 Merge git://github.com/Baystation12/Baystation12 
Conflicts:
	code/defines/procs/gamehelpers.dm
	code/game/mecha/mecha.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 09:08:55 +10:00
Tastyfish 8ac1598427 Merge pull request #374 from SkyMarshal/master 
Perapsam's Map update!
 2012-02-06 14:18:45 -08:00
Tastyfish b6ba1b74fa streamlined copy machine code 2012-02-06 17:16:16 -05:00
CaelAislinn 06fad98469 fixed mech charge port bug, fixed (?) autolathe bug, miscellaneous map fixes 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 08:05:47 +10:00
CaelAislinn 9ca058fd1b added a couple of missing networks to department camera monitors 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 06:59:35 +10:00
SkyMarshal 16e38a6d7c Fixes for the map. 2012-02-06 12:16:56 -07:00
SkyMarshal 64e6baa669 Map update! Added perapsam's map changes, fixed up some derp in the brig. 2012-02-06 12:06:13 -07:00
Tastyfish d2404e8a79 Merge remote-tracking branch 'upstream/master' 2012-02-06 13:41:59 -05:00
Albert Iordache cef969cd31 Merge pull request #373 from SkyMarshal/master 
AI's can now understand pAI speech
 2012-02-06 10:16:42 -08:00
SkyMarshal 664c6b7dec AI's can now understand pAI speech 
Tidied up some.
 2012-02-06 11:02:49 -07:00
CaelAislinn 750b2e6d8d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-02-07 03:53:41 +10:00
CaelAislinn 647ed920eb removed redundant proc, updated old blood in multiz 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 03:53:01 +10:00
SkyMarshal 3feb42e795 Merge pull request #350 from caelaislinn/master 
cameras update, added tajaran race
 2012-02-06 09:47:03 -08:00
CaelAislinn 437474add1 removed backup maps 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 03:35:06 +10:00
CaelAislinn 87838c7cc5 Merge git://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-07 03:28:09 +10:00
CaelAislinn 2c1940c5e7 rolled back another unintentional change 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 21:31:18 +10:00
CaelAislinn 32a37c6001 fixed taj speak and taj whisper (not working over radio chat). use :j after the radio/headset commands to speak or whisper in tajaran (only taj mobs can speak / understand it) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 21:27:27 +10:00
SkyMarshal 3dd16986fc Merge pull request #372 from SkyMarshal/master 
BUGFIXES
 2012-02-05 20:57:00 -08:00
SkyMarshal 1f25c49c06 MOAR BUGFIXES 2012-02-05 21:56:12 -07:00
CaelAislinn 1593a4923e new characters' jobs are now announced by the arrivals computer 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 05:26:41 +10:00
CIB 0d5a72b4bd Merge pull request #371 from SkyMarshal/master 
Fixed up the blood problems, removed a compile warning because Hawk doesn't compile.
 2012-02-05 11:20:08 -08:00
SkyMarshal 85ee6ae562 Fixed a warning with meteors, HAWK: COMPILE DAMMIT 
Blood now works properly.
 2012-02-05 11:52:42 -07:00
CaelAislinn 2bc65eeb31 added erths computer sprites, fixed a missing window in the RD server room 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 04:40:06 +10:00
CaelAislinn 9c3e7171f3 fixed mechs being able to interact with things in the players inventory 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 04:27:41 +10:00
SkyMarshal 24d42f0ef8 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-02-05 11:23:58 -07:00
SkyMarshal 429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
CaelAislinn b6b8073185 added erth's lockdown comp sprite 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 03:54:18 +10:00
CaelAislinn c74bf1d40e added erths copier sprites 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-02-06 03:50:48 +10:00