cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,973 Commits 5 Branches 0 Tags
462a32f57a60ecd2787d71a79f15a877d0e8d83c
Commit Graph

972 Commits

Author SHA1 Message Date
Albert Iordache
462a32f57a Merge pull request #139 from Tastyfish/master 
Library category fixes, moved edit appearance->fun where it should be
 2011-12-25 04:44:26 -08:00
Albert Iordache
cf43b6726d living/say(text) is now logged before applying any filters to the text. 2011-12-25 14:41:39 +02:00
Tastyfish
359ffe93e1 Merge remote-tracking branch 'upstream/master' 2011-12-25 00:55:20 -05:00
Tastyfish
67af6ac4d2 future-proof food code for other critters snacking 2011-12-25 00:55:18 -05:00
Tastyfish
31a2f6d5ef library category fixes, moved edit appearence->fun where it should be 2011-12-25 00:52:36 -05:00
Albert Iordache
88bcb26710 Fixed a compiling error. 2011-12-25 01:05:43 +02:00
Albert Iordache
6f23ef6b22 Fixed an evidence bag runtime error and added a few CRASH() checks to /obj/machinery/disposal 2011-12-25 00:59:59 +02:00
vageyenaman@gmail.com
75c7670e75 TG update: Small changes and bugfixes: 
◦ Metroids can now be observed by ghosts.
   ◦ Saved User Interface preferences ("Old UI" & "New UI") now correctly get transferred to clones.
   ◦ Captain announcements now require the player to be next to the console. (Issue 220)
   ◦ Radio headsets no longer sometimes fail to deliver the messages (Issue 221)
   ◦ Some other insignificant back-end shenanigans.
   ◦ The pregame lobby now has title music. The gameticker chooses between two .ogg files on game start and plays that for everyone who joins. The music stops when create_character() gets called though.
   ◦ Gave some critters, namely "creature" and "blob" some attack sounds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2655 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:15:22 +02:00
rockdtben
fac10fb031 TG update: Removed all global modifications of toxloss. Added a setToxLoss() proc. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2653 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:07:37 +02:00
rockdtben
ea79e4b272 TG update: Removed some redundant checks 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2652 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:06:57 +02:00
ryantennessee@yahoo.com
7707864437 TG update: Jetpack changing to wrong sprite when turned on fixed. Syringes will autochange inject/draw when full/empty. Medborg syringes start full and set to inject even though the icon is still messed up. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2650 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:05:16 +02:00
ryantennessee@yahoo.com
d565fe7a9c TG update: Tracked down the last bottles with limited transfer amounts and made more transfer amounts for them. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2647 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 22:00:26 +02:00
ryantennessee@yahoo.com
a631f38041 TG update: Drills and Ddrills now dig sand faster than shovels. Changed digging to produce 5 glass ore instead of 4. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2646 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 21:59:03 +02:00
Albert Iordache
6fd39d5ef6 TG update: food.dmi 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2644 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 21:37:53 +02:00
Tastyfish
a0a49b6ee1 forgot to add category to edit appearence verb 2011-12-24 09:16:02 -05:00
Tastyfish
3f1d378f13 edit appearance admin verb ported from old code 2011-12-24 02:38:21 -05:00
Albert Iordache
b067fdc726 TG update: ... 
- added feedback logging for alert levels
 - alert level descriptions are now part of config.txt
 - alert levels default to the ones I had before, if the config file isn't configured.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2641 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 00:50:52 +02:00
n3ophyt3
fd9c3ad6a8 TG update: Fixed an issue with the captain's laser. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2640 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 00:50:52 +02:00
baloh.matevz@gmail.com
f949f125e4 Command intercept will now only increase the security level if it's lower than blue... 
Added a keycard authentication device. When you interact with it it asks you which event you'd like to trigger, currently only "Red alert". When you select the event, it asks you to swipe your ID card. If you have the new keycard auth access (60) on it (all heads of staff do), it will trigger all other devices of the same type to flash for 2 seconds. If someone with the same access level on their card swipes their card on another device during this period, the event will happen.

The idea behind this is the two key idea from submarine movies - just with ID cards. Admins are informed who requests the event and who triggers it btw, so abusing this is a bad idea.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2635 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 00:50:50 +02:00
Albert Iordache
35e5698a9c TG update: Made steel and reinforced glass correctly decrease ore amounts. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2631 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-12-24 00:50:49 +02:00
Miniature
d74592c99e Merge branch 'master' of github.com:Baystation12/Baystation12 2011-12-24 03:34:53 +10:30
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
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
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
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
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