cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,915 Commits 6 Branches 0 Tags
cee96346060fa77e07a8c56c31c569a9af6620a4
Commit Graph

946 Commits

Author SHA1 Message Date
Tastyfish
cee9634606 stick id's in computer by using id on it, better ear examine text 2011-12-22 01:47:40 -05:00
Tastyfish
db806b85d0 improved ear examine phrasing 2011-12-22 01:29:47 -05:00
Tastyfish
619ebeba66 updated NT law wording,NT law module in upload,lizards scratch instead of punch via space's rq,fixed downloading books 2011-12-21 03:55:16 -05:00
Mister Fox
9f52aef132 Added toggle-godmode, invisibility for Game Admins, BS12 versions of proccall for Game Masters 
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
 2011-12-20 08:01:54 -05:00
Mister Fox
2dffc6d00d Merge branch 'master' of git://github.com/Baystation12/Baystation12 2011-12-20 06:43:08 -05:00
MlocMcMloc
9024737097 Merge pull request #126 from MlocMcMloc/master 
Removing EI NATH and gib-dropping.
 2011-12-20 02:57:06 -08:00
Mloc
d906d1358f Removed wizard gib spell, make gibbing and dust-ing drop everything on the person. 
Signed-off-by: Mloc <mloc@mloc.netii.net>
 2011-12-20 10:12:51 +00:00
MlocMcMloc
7f540f6811 Merge pull request #121 from SkyMarshal/882fb96574109859b6e503804190390b27e1c738 
Yet again, check the description.
 2011-12-19 08:09:25 -08:00
MlocMcMloc
eebad1184b Merge pull request #119 from Tastyfish/master 
added 2 ears! (DNA scan this time!)
 2011-12-19 08:08:53 -08:00
Mister Fox
35b68d10e1 Automatic guest kicking 
Signed-off-by: Mister Fox <traitor.foxy.brown@live.com>
 2011-12-19 08:30:15 -05:00
SkyMarshal
1c67be2707 Several fixes/additions. Will list in pull request. 2011-12-18 20:56:39 -07:00
CompactNinja
f401c2e9ed Yes CN, ckey IS all in lower case. Lil' insignificant bugfix on my behalf. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-19 01:37:53 +10:30
Tastyfish
e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish
e3219fd09d 2 ears! 2011-12-18 06:02:15 -05:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
SkyMarshal
9c1b83bd88 Fixed some derp. 2011-12-18 00:26:53 -07:00
SkyMarshal
fc3914364f Finished pepperspray, added mace item, improved security console, and a few other things. Will know when I see the diffs. 2011-12-18 00:23:02 -07:00
SkyMarshal
a0298c0477 Should improve pepper spray a bit. Reduced to 2 shot per Hawkie's request. 2011-12-17 18:37:23 -07:00
SkyMarshal
159ce32cc7 Improved pepper spray, added a safety catch to pepper spray and space cleaner, added a wire to reset the module of a borg. 2011-12-15 23:58:17 -07:00
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
Miniature
79bb7bdf61 Fixed getting too much sand from a single tile by clicking really fast 2011-12-14 13:02:09 +10:30
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
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
Albert Iordache
45fa16929e Merge #93 cleanup. 2011-12-11 11:11:06 +02: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
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
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
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
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
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
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
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
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
unknown
8f11c4acfb DO NOT USE. 2011-12-08 17:07:25 -07:00
SkyMarshal
009d0915bf Removed most other cyanide references. Remade cyanide pills into suicide pills (100 units of Toxin) 2011-12-08 14:22:45 -07:00
SkyMarshal
d7eb6e4ae6 Remove Cyanide, add Sleepy Pen and Thermals to uplink, remove cloaker 2011-12-08 12:35:10 -07:00
Albert Iordache
dd6ddaa8c3 Revert "removed cloaker" 
This reverts commit 1fa97843f8.
 2011-12-08 15:28:35 +02:00