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
2,883 Commits 5 Branches 0 Tags
a9b246b4abf97b10fbaf12f412c84daa1c6db2fb
Commit Graph

2154 Commits

Author SHA1 Message Date
SkyMarshal
a9b246b4ab Second rework of security console. Not done. 2011-12-19 00:13:05 -07: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
Albert Iordache
bca2746d7c Fixed a spelling mistake. 2011-12-18 13:05:18 +02:00
Albert Iordache
f4a24a9804 Merge pull request #118 from SkyMarshal/master 
Removed a lot of goonish flavor text, resprited emag and centcom id.
 2011-12-18 03:03:04 -08:00
SkyMarshal
fda118e9ac Reworked emag again, new centcom id sprite, removed derpy flavor text. 2011-12-18 03:20:54 -07:00
Albert Iordache
1816be90a0 Merge pull request #117 from SkyMarshal/master 
Again, check description.
 2011-12-18 00:28:53 -08:00
SkyMarshal
3d51c2487b Fixed a bunch of descriptions. 2011-12-18 01:06:05 -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
Tastyfish
75ddaeb9f9 Merge remote-tracking branch 'upstream/master' 2011-12-17 21:52:05 -05:00
Tastyfish
a741413992 carve books, remove immovable rod/gr3y t1de 2011-12-17 20:46:42 -05: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
Miniature
f0aadd4c70 Merge pull request #112 from Miniature/master 
Sanity checking for secret (step 1 in fixing hideous number of runtimes)
 2011-12-17 05:26:02 -08:00
Miniature
803f79c165 This should lower the hideous number of runtimes we've been having lately. 2011-12-17 23:49:20 +10:30
Albert Iordache
d8d876681e Merge pull request #110 from SkyMarshal/159ce32cc7ed547c2004fcc260c16282a415afbc 
Too long for the title, check the description
 2011-12-17 01:27:00 -08:00
Miniature
8b15283862 Made sandbox not votable 2011-12-16 22:25:02 +10:30
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
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