cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,126 Commits 10 Branches 0 Tags
5628272bde0235f752765d64ea1462ed9f51a724
Commit Graph

2336 Commits

Author SHA1 Message Date
Miniature
803bed1c18 Custom items for special people 
They have to be manually coded in atm, but someone will no doubt eventually make it use a database when we get that going again (if we don't already)
 2011-12-24 03:34:25 +10:30
Miniature
701ea98e6d Fixed a vote runtime, hopefully this makes it delay start (probably won't tho) 2011-12-23 19:14:58 +10:30
cib
d539e4b539 Changed the pregame time from 90 seconds to 180 seconds. Delay(admin verb) can now also be used after round end has been announced, to keep the world from rebooting. Also boosted the restart delay from 25 seconds to 60 seconds. 2011-12-22 16:34:10 -08:00
Albert Iordache
08b7c6487b Merge pull request #130 from Tastyfish/master 
improved sec/med id card handling, records management, also spaceman christmas
 2011-12-23 01:17:13 -08:00
Miniature
f311f8c7cc Merge pull request #131 from Miniature/master 
Fixed a vote runtime
 2011-12-23 00:47:46 -08:00
Tastyfish
a302464d3b Merge remote-tracking branch 'upstream/master' 2011-12-23 02:22:39 -05:00
Tastyfish
8f53cb2d87 spaceman requested everyone having christmas hats admin verb for possible christmas event. it was possibly a joke I took seriosuly 2011-12-23 02:20:16 -05:00
Tastyfish
d14b67782a added being able to backup sec/med records to disks, ejecting card trys to put it in your hand before dumping it ontop 2011-12-22 05:34:05 -05:00
Albert Iordache
6891b856c4 Fixed an obj/item/seeds/proc/harvest() runtime error related to grass seeds. 2011-12-22 09:30:34 +02:00
Albert Iordache
5964e0dc30 Fixed an obj/machinery/disposal/attackby() runtime error. 2011-12-22 09:11:04 +02:00
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
Albert Iordache
09d7739b08 Fixed a runtime error related to all items now being checked for var/protective_temperature and fixed another runtime error by doing something unholy. 2011-12-22 00:12:29 +02: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
Tastyfish
376d207435 borgs can mend airlocks, status examine, sinks, manuals 2011-12-20 22:03:48 -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
SkyMarshal
dafd9d68f9 Final revision of Security Console (Hopefully.) 2011-12-19 23:24:00 -07:00
SkyMarshal
14ac797deb Should finialize the improved Security Console 2011-12-19 22:12:04 -07:00
SkyMarshal
618fd87f35 Not done yet. 2011-12-19 11:01:24 -07:00
unknown
3fac91df13 Merge remote-tracking branch 'upstream/master' 2011-12-19 09:20:09 -07: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
Miniature
9d16875f56 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-19 21:04:21 +10:30
Miniature
6a9ed446be Fixed camera chunks still being shown when an AI dies in freelook mode 2011-12-19 21:03:47 +10:30
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
Tastyfish
e85b253eb3 Merge remote-tracking branch 'upstream/master' 2011-12-18 06:12:21 -05:00
Tastyfish
7d48e87e2a made 2-eared setup prettier 2011-12-18 06:12:00 -05:00
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
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
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
64cad184a1 dna scan 2011-12-17 23:06:58 -05: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