cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 22:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,197 Commits 8 Branches 26 Tags
462effc1d20ae5e6aeffe87f6019ba767be59593
Commit Graph

6956 Commits

Author SHA1 Message Date
SkyMarshal
25e1633487 Merge pull request #259 from Tastyfish/master 
Took long enough to fix this damn bug.
 2012-01-10 20:39:05 -08:00
Tastyfish
f404ea91d6 Merge pull request #260 from SkyMarshal/master 
Disposal updates + map fix, traitor objective fix, Cult teleport talisman now teleports grabs
 2012-01-10 20:38:14 -08:00
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
Tastyfish
763c9ec07b paint is reagent, fixed ai core bug 2012-01-10 18:05:19 -05: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
trubblebass@gmail.com
1ea40a5e48 - Oops, forgot to remove the old file 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2938 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-10 17:21:38 +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
Albert Iordache
5e5d72d36d Reverted changes that would stop the bible from healing occasionally, and from burning the hands of people picking it up, who aren't chaplains 2012-01-09 21:59:25 +02:00
Tastyfish
f38406ec20 Merge pull request #252 from SkyMarshal/master 
Fixed bible, medibots, added kitchen packager, ported TTP
 2012-01-08 23:19:03 -08:00
cib
9b8e24c9d1 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-09 07:45:56 -08:00
cib
80f8c70e09 Band-aids and ointment work until 0 health, rather than 50 now. 2012-01-09 07:45:00 -08:00
SkyMarshal
7dec599f9b Fixed medibot stupidity and bible shit. 2012-01-09 00:06:57 -07:00
Tastyfish
58c3d6ebe3 cleaned up brain transfer 2012-01-09 01:24:42 -05:00
Tastyfish
409da96055 can operate on heads to get the head out now, also skin color 2012-01-09 01:06:16 -05: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
kortgstation@gmail.com
08edb890c9 Added the new security locker sprites by Ricotez (well mostly, he forgot to make the emag sparking set, but that was just copypasting anyway) 
Commented out Agouris shitty code that caused compile errors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2930 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-08 21:40:42 +00:00
polyxenitopalidou@gmail.com
091936f0b5 •Softcaps, flippable 
•Improved bodybags, also changed sprites. Scream at me if you don't like them, I'll change them back. Also sorry for the 114KB new sound.
•Sorry but I really have to defecate while writing this

•You can find the unused newscaster sprite of my new project in terminals.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2928 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-08 17:44:32 +00:00
Albert Iordache
9d2e285190 Fixed a bug with obj/item/clothing/under/chameleon/psyche , added some small details to Antiqua and redid the arrivals arm, and removed the patient ward area. (can still be recovered via TortoiseGit, by reverting to an earlier version; I'll explain in the Antiqua topic why I removed it) 2012-01-08 19:19:53 +02: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
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
SkyMarshal
145b3d3b5f Tweaked flamethrowers slightly, made the UI actually do something and fixed an icon that was not updating. 2012-01-07 11:19:04 -07:00
SkyMarshal
40a0a5499e Bugfix for some table stuff I forgot. 
Fixed a small message for writing on paper.
 2012-01-07 10:51:32 -07:00
quartz235@gmail.com
09c4db8978 Fixed being unable to make regular/reinforced windows 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2920 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-06 22:18:01 +00:00
quartz235@gmail.com
3769ce0998 - Welding shards while on top of a stack of glass (with less than 50 sheets) now adds the produced glass to the stack. 
- Some runtime fixes

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2919 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-06 21:45:49 +00: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
68070d9061 Bugfixes for cloning and the mail sorting machinery. 2012-01-06 11:38:56 -07:00
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
3be149b2b3 Fixes discussed on IRC. Fixed a broken sort junction I miseed. (Thanks tasty!) 2012-01-05 15:44:28 -07:00
Tastyfish
abd22255f3 Merge remote-tracking branch 'upstream/master' 2012-01-05 17:15:33 -05:00
Tastyfish
a7b85707dd porting in bones and dismemberment 2012-01-05 17:15:29 -05:00
Albert Iordache
53d989dda2 Merge pull request #224 from CIB/master 
Medical stuff
 2012-01-05 12:22:19 -08:00
cib
9e035424da Nerfed the medbot and bruise packs. 2012-01-05 19:36:26 -08:00
SkyMarshal
fbd4004781 Merge pull request #223 from SkyMarshal/master 
Bugfix/tweak
 2012-01-05 09:33:42 -08:00
SkyMarshal
86b42f815f Tweaked garble-ness on radios in other Z-levels 2012-01-05 10:31:42 -07:00
cib
1f9797934e Made the explosionfar sound occur more often. 2012-01-05 17:39:13 -08:00
mport2004@gmail.com
2ea375091e Renamed the prisoner computer's file to prisoner and added a sanity check. 
The singularity is now able to eat things like signs and chameleon projectors' projections.
A few other misc runtime fixes.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2916 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-05 05:26:13 +00:00
Tastyfish
a2ff049861 merge 2012-01-04 23:01:22 -05:00
trubblebass@gmail.com
4d1d38d5f3 - Fixed Issue 293 
It now correctly reads 15 Units.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2915 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-04 20:39:46 +00:00
SkyMarshal
b2e25d39b8 This should work, not sure. 
Signed-off-by: SkyMarshal
 2012-01-04 11:08:47 -07:00
mport2004@gmail.com
b5944308c7 Moved most of the computer defines into the proper code file. 
Moved a few of the computers into their own files.
Security records now shows rank on the browse screen.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2909 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-01-03 21:16:48 +00:00
Albert Iordache
33833b9acb Merge pull request #202 from SkyMarshal/master 
OHMYGOD I coded a ton.
 2012-01-03 11:14:20 -08:00
Albert Iordache
08ab4448b8 Merge pull request #194 from Miniature/master 
bunch of emlocker stuffs, also a couple of runtimes
 2012-01-03 09:03:18 -08:00
Miniature
8aba29cc9c Fixing some null runtimes 2012-01-04 03:15:20 +10:30
Miniature
9a81f4496b Finished emlocker stuff 
if someone wants to move where the spawning is done feel free
 2012-01-04 02:15:38 +10:30
SkyMarshal
9a651a5a84 Added psyche jumpsuit for Asanadas 
Expanded scrambled radio stuff.
 2012-01-03 00:06:25 -07:00