cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 07:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 7 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

9413 Commits

Author SHA1 Message Date
SkyMarshal
3b57d309cc Disposals are now much more robust, with sorters being program-able, food able to be packaged, people able to flush closets, proper construction of sorters, and a function on taggers to use a custom tag. 
In addition:
Made teleport talismans more amusing.
Fixed duplicate traitor objectives.
 2012-01-10 21:21:52 -07:00
SkyMarshal
f36c56f5c7 Disposal updates, fixed a messed up maintenance door. 2012-01-10 15:37:42 -07:00
mport2004@gmail.com
037768b7b1 One more san check. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2942 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-10 22:23:27 +00:00
quartz235@gmail.com
26a2f20340 Runtimes are funtimes! 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2941 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-10 22:21:26 +00:00
mport2004@gmail.com
188dfb526e Fixed a few runtimes. 
Moved the all player mobs death check into the parent death proc.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2940 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-10 22:13:06 +00:00
trubblebass@gmail.com
13d729577d - Changed /trunk/code/game/objects/closets/fireax.dm to fireaxe.dm 
- Fixed issue 308
Singularity engine parts are now unanchored by default. However those on the map have been edited to all be anchored.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2937 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-10 17:20:46 +00:00
polyxenitopalidou@gmail.com
6db3b3239b •Fixed bug with fireax (who corrected it from fireaxe? Thanks :3) closets becoming invisible. 
Thanks, LJ.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2936 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-10 13:06:10 +00:00
cib
0340e5f58e More medical changes. 
- Added tramadol and oxycodone, both effective painkillers.
- Shock now takes drunkness into account.
- Added some firstaid stuff to the table in the medbay lobby, so people can do treatment when there's no doctors.
 2012-01-10 09:16:11 -08:00
Miniature
d5fc419a0d Merge pull request #256 from Miniature/master 
fix runtimes in disposals pipes and seed making for a plant
whoever coded this should be shot
 2012-01-09 16:28:31 -08:00
Miniature
225b2ad03e fix runtimes in disposals pipes and seed making for a plant 
whoever coded those parts should be shot
 2012-01-10 10:56:58 +10:30
SkyMarshal
25426e6f02 Merge pull request #254 from SkyMarshal/master 
Bugfix.
 2012-01-09 09:08:53 -08:00
SkyMarshal
e455f46cfd More bugfixing 2012-01-09 10:08:11 -07:00
SkyMarshal
46fb684c0b Bugfix for chem grenades and Disposals. 2012-01-09 09:58:33 -07:00
rockdtben
2f2c4e98a6 Just adding a proc that I am going to use in the organ system soon. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2935 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-09 14:51:29 +00:00
Tastyfish
12675d12d2 fixed bad html on pain text 2012-01-09 06:54:19 -05:00
Tastyfish
b953f61ad6 Merge remote-tracking branch 'upstream/master' 2012-01-09 01:25:02 -05:00
Tastyfish
58c3d6ebe3 cleaned up brain transfer 2012-01-09 01:24:42 -05:00
SkyMarshal
3a154153bf Merge pull request #248 from Tastyfish/master 
Looks good.  Fixes some dismemberment and stuff.
 2012-01-08 22:12:45 -08:00
cib
a36aebb512 A few medical-related fixes. 
- Fixed another problem related to the crit config
- Recovering from shock won't take forever anymore
- Reduced the max speed at which you suffocate, mainly to make crit slower. If this is found to affect normal suffocation too much, increase HUMAN_MAX_OXYLOSS again.
- Open organs now add a lot of shock, as well.
- Hitting 0 health or below will make you collapse immediately.
 2012-01-09 06:30:16 -08:00
cib
82033108bb The config's HEALTH_TRESHOLD_CRIT option was being ignored in a few places, fixed this. 2012-01-09 04:30:15 -08:00
cib
f827d9f56e Small addition so that traumatic shock will increase when a limb is missing or broken. 2012-01-09 04:09:57 -08:00
Tastyfish
409da96055 can operate on heads to get the head out now, also skin color 2012-01-09 01:06:16 -05:00
quartz235@gmail.com
cefb9c8217 - Updated .dme from polymorph's area defines thingy 
- Per XSI's request (and Muskets' consent,) toggle OOC color is now a Game Admin level command (as opposed to Game Master.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2933 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-09 01:48:59 +00:00
vageyenaman@gmail.com
2f92ba494e Possibly the finishing touches to the telecomms prototype. They will be included in the game soon-ish. 
Some work on critters. Added a new critter type: the VISCERATORS. (http://dl.dropbox.com/u/10657252/SS13/Manhacks.PNG) Includes a small new audio file. They'll probably be created with a traitor item or a box-o-hacks in the armory.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2932 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-09 01:48:38 +00:00
Tastyfish
1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05:00
Tastyfish
ce9042ae20 bones and dismemberment 2012-01-08 20:05:54 -05:00
Albert Iordache
4a3c17738e Fixed a bug with the player panel 2012-01-08 20:42:05 +02:00
SkyMarshal
6e0d8de599 Fixed bug involving toolboxes and the Destructive Analyzer 2012-01-08 11:37:57 -07:00
VivianFoxfoot@gmail.com
4ef0251aad Moves the areas procs all into the same file. 
Comments out an if statement to supress a warning.
Although not yet located on the map, adds the code for gravity generators.
Actually enables attack logging by default, now.  


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2927 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-08 08:47:54 +00:00
VivianFoxfoot@gmail.com
1f29357168 Adds logging in the form of an attack log.log (now enabled by default) 
You can now drag PDAs onto yourself to open the screen
Disables the fire damage causing husking.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2926 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-08 03:30:25 +00:00
cib
66330222d3 Buffed the speed at which the chemistry charger generates chemicals, and also the power consumption. 2012-01-07 20:39:35 -08:00
uporotiy
85157b5a68 Steel renamed to plasteel. 
Having more than 100 burn damage and being dead now makes you a husk.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2925 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-07 21:02:56 +00:00
Albert Iordache
970ee20614 Merge pull request #239 from SkyMarshal/master 
Table update!  Yaay!
 2012-01-07 00:39:00 -08:00
cib
b8f799e6d3 Emergency teams took a bit too long to be sent. 2012-01-07 02:03:13 -08:00
SkyMarshal
1c0cff4dac Derp 2012-01-07 01:04:15 -07:00
SkyMarshal
5fd641599e Fixed stupid unescapable edit apperance 
Fixed some stupid with grenades.
 2012-01-07 00:49:48 -07:00
baloh.matevz@gmail.com
f605aee179 Jobbans now ask for a reason each time you try to apply a jobban. Reasons are displayed in the 'show job bans' panel. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2922 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-07 00:46:01 +00:00
VivianFoxfoot@gmail.com
fd2bd8459f Adds the ability for the Communications Console to send emergency messages to Centcomm (or, when emagged, to the Syndicate.) This messages admins in the same fashion as a prayer. 
Adds a button to the messages that admins receive from Syndiate/Centcomm messages called 'BSA' and hits the target with bluespace artillery if the message was suitably stupid. 
Because of the IC act of sending the message as opposed to prayer, does not respect see_prayers.  Depending on (ab)use, may be changed

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2921 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-07 00:05:01 +00:00
SkyMarshal
3c128170a3 Shit to update 2012-01-06 16:50:19 -07:00
Tastyfish
ffe6ac7935 Merge remote-tracking branch 'upstream/master' 2012-01-06 16:41:52 -05:00
Tastyfish
c4f5429857 furthur work on bones 2012-01-06 16:41:47 -05:00
SkyMarshal
240153a8a5 Genetics is no longer a fortress, fixed some disposals silliness. 2012-01-06 13:17:17 -07:00
SkyMarshal
68070d9061 Bugfixes for cloning and the mail sorting machinery. 2012-01-06 11:38:56 -07:00
Albert Iordache
8279f080dd Merge pull request #232 from Miniature/master 
made blindness overlay transparent to mouse
 2012-01-06 09:48:36 -08:00
VivianFoxfoot@gmail.com
1c7d1fbd33 Moves /obj/special/stop into /obj/effect/stop. 
Thunks people when gravity changes.  

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2918 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-06 17:12:46 +00:00
Miniature
090a5c75d1 made blindness overlay transparent to mouse 2012-01-07 02:53:50 +10:30
VivianFoxfoot@gmail.com
8730d375cf Adds a new special object (stop) that can be used when you need someone to stop moving right away, even before the next life(). Used in door crushing to prevent people from inertiaing through. Checks for /obj/special/stop in loc every move. Compared to the number of other checks, I don't expect this to be an undo burden, but can be commented out in case of OH SHIT LAG under heavy load. 
Moves /area/entered to its own file.  
Adds a new area var called has_gravity.  Determines if floor tiles count for movement control (planning on adding more, currently can only be badmined)
Adds a new mob var called lastarea that is updated with the area you're in every time /area/entered is called. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2917 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-06 06:24:55 +00:00
SkyMarshal
7872eeafc1 Cloning now works right from any and all consoles. 
Make the mail management less buggy and more robust.
 2012-01-05 21:50:20 -07:00
cib
a7a42410ec Added an emergency response team mechanism that will be triggered on code red after a while. Dubbed the station the NSS Exodus. 2012-01-06 04:13:10 -08:00
CIB
f3ebb75637 Merge pull request #221 from Miniature/master 
Now you don't need to call a proc when you use proccall(bs12)
 2012-01-05 14:59:13 -08:00