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
3,126 Commits 8 Branches 0 Tags
5628272bde0235f752765d64ea1462ed9f51a724
Commit Graph

2336 Commits

Author SHA1 Message Date
SkyMarshal
79ad7d1ae9 Should improve pepper spray, and remove coolness check on detective's revolver 2011-12-15 20:34:36 -07:00
Jimapples
5926961f13 Added a missing food icon 2011-12-14 21:03:23 +00:00
Tastyfish
6dbe431045 bunch of library fixes / improvements 2011-12-14 07:39:03 -05:00
Miniature
11281605e9 Merge pull request #105 from Miniature/master 
Fixed getting too much sand from a single tile by clicking really fast
 2011-12-13 18:34:08 -08:00
Miniature
79bb7bdf61 Fixed getting too much sand from a single tile by clicking really fast 2011-12-14 13:02:09 +10:30
CIB
e6901f2317 Merge pull request #103 from Tastyfish/master 
Hahah, them so silly
 2011-12-13 09:11:26 -08:00
Miniature
8695077f43 display player info -> show player info 
so that typing "player{tab}{enter}" brings up player panel again
 2011-12-14 00:01:13 +10:30
Tastyfish
0e8d32df49 fixed com console security screen 2011-12-13 01:32:03 -05:00
Albert Iordache
62bdb7e67a Merge pull request #102 from Miniature/master 
Dogs don't wear clothes.
 2011-12-12 21:35:24 -08:00
Miniature
8889972b07 Dogs don't wear clothes. 2011-12-13 13:18:46 +10:30
Albert Iordache
d1f3e867ea Merge pull request #100 from Tastyfish/master 
Updated firing range, added pepperspray refill in armory
 2011-12-12 10:55:50 -08:00
Miniature
b3edc62393 Added shitty MSPaint recolour of engineering rig for security rig UI (it was using the on-mob sprites) 2011-12-13 01:37:29 +10:30
Tastyfish
e9d9864720 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	maps/tgstation.2.0.8.dmm
 2011-12-12 02:23:50 -05:00
Tastyfish
d133fbe61d sleepy pens cost 4 2011-12-12 02:09:16 -05:00
Tastyfish
c3d6d6702a actually did skymarshal's changes to the PDA uplink, he changed the nuke team uplink radio 2011-12-11 21:20:06 -05:00
Miniature
da96fabe25 Fixed json thing 2011-12-12 01:33:47 +10:30
Albert Iordache
45fa16929e Merge #93 cleanup. 2011-12-11 11:11:06 +02:00
Albert Iordache
6f74292c51 Merge pull request #93 from CIB/master 
Engineering map update
 2011-12-11 01:06:23 -08:00
Albert Iordache
b411ecf570 Merge pull request #95 from Strumpetplaya/master 
Greatly increased the chance for breath mask and oxygen tank to spawn in O2 closets
 2011-12-11 00:25:50 -08:00
Albert Iordache
9b42ef2db8 Merge pull request #94 from headswe/master 
Made blob take damage from airbased fire hopefully.
 2011-12-11 00:25:00 -08:00
StrumpetPlaya
5314bd707c Greatly increased the chance for breath mask and oxygen tank to spawn in 
O2 closets.

Also redid Radiation suit change.  It seemed to get messed up by /tg/
update I guess.
 2011-12-11 00:37:54 -05:00
Head
99e2894d01 Made the blob take damage from fire. 2011-12-11 02:21:51 +01:00
Albert Iordache
0a4ae48ca7 Fixed compile error. 2011-12-11 01:35:57 +02:00
Albert Iordache
073d160e38 Merge branch 'master' of https://github.com/SHFFLE/Baystation12 into shffle-master 
Conflicts, manually merged:
	icons/mob/suit.dmi
	maps/tgstation.2.0.8.dmm
 2011-12-11 01:24:42 +02:00
CIB
985112f052 Merge pull request #92 from Abi79/master 
Slurring from Alcohol, btw. Aryn wrote the slur proc
 2011-12-10 12:54:45 -08:00
Albert Iordache
9d774ed3c9 Coffee and black tea now gets rid of the slurriness from alcohol. Also added Cib's slur proc. 2011-12-10 22:33:18 +02:00
SHFFLE
412759a35b Added Security RIG 2011-12-10 12:48:28 -06:00
cib
9dbe06b22b Added a notes panel that lists all players that have notes on them. 2011-12-11 02:48:02 +08:00
StrumpetPlaya
32811b1b9d Fixed runtime error involving cyborgs and fibers. 
Also changed Show Server Revision at Head's request.  Can't really test it
locally so hopefully this is what he meant.
 2011-12-10 11:27:48 -05:00
Albert Iordache
2d4e356d8c Merge pull request #86 from CIB/master 
Made some improvements to the player info panel
 2011-12-10 06:22:22 -08:00
Albert Iordache
e72ae5e8f6 Added a new slurring variable, and set it up in the right places 2011-12-10 14:25:49 +02:00
Albert Iordache
41dedca7b9 Merge pull request #85 from Tastyfish/master 
added categories to QM ordering/request stuff so it isn't a giant several-page list
 2011-12-10 02:42:21 -08:00
Albert Iordache
c68a22f497 Merge branch 'SkyMarshal-764432e' 2011-12-10 12:35:15 +02:00
Albert Iordache
5d2dfbcff7 Thermals now look like regular sunglasses. Added some special engineering emergency oxygen tanks to engineering. 2011-12-10 12:29:02 +02:00
Albert Iordache
6c992058e4 Code cleanup + gravitational anomaly readded 2011-12-10 11:59:40 +02:00
Albert Iordache
64106be003 Merge pull request #82 from SkyMarshal/3319b22adf33c757fc42aa515bc05db894fd0e90 
Lot of tweaks and fixes, read the description.
 2011-12-10 01:43:34 -08:00
cib
4d00ed6890 Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/defines/mob/mob.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
	code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/humanoid/queen.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	maps/tgstation.2.0.8.dmm
 2011-12-10 01:11:00 -08:00
Tastyfish
61ae382c16 added categories to QM stuff so it isn't a giant several-page list 2011-12-10 01:25:27 -05:00
cib
5a3320f30f Added a notes panel that lists all players that have notes on them. 2011-12-09 17:45:13 -08:00
cib
d970d2b4f9 Added a drunk variable and a text filter specifically for drunk talking, originally coded by Aryn. 2011-12-09 16:44:13 -08:00
cib
3a27c74b46 Some small improvements to the player info panel. 2011-12-09 15:12:01 -08:00
Albert Iordache
ae34949324 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-09 18:58:32 +02:00
Albert Iordache
3efa552eda Merge branch 'master' of https://github.com/Miniature/Baystation12 into Miniature-master 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
 2011-12-09 14:56:32 +02:00
Tastyfish
afd1aca53b let everyone do me emotes properly! (bots,monkeys,...) 2011-12-09 02:24:33 -05:00
SkyMarshal
764432e4e8 Fixed minor errors. 2011-12-08 22:13:51 -07:00
SkyMarshal
61d21b3cab Added the ability for borgs to ude departmental radios 2011-12-08 22:02:46 -07:00
cib
5b349cc549 Revert "Moved the singularity and particle accelerator a bit out of the station. Added some stuff to engineering and generally organized it a bit." 
This reverts commit a6e7d09620.
 2011-12-08 20:47:37 -08:00
cib
11bf4a45a5 Added a "player info" option to the player panel that will allow you to make notes on a specific player etc. 2011-12-08 20:43:20 -08:00
cib
4b7c6c5183 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-08 18:44:43 -08:00
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00