cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,171 Commits 26 Branches 2 Tags
e8bd665e7652d0aaa26dbeb0bbac472fbb45ff21
Commit Graph

63 Commits

Author SHA1 Message Date
SkyMarshal
4524a2ff10 Disposals for mining, final blood_DNA stuff, cleaned up more code, fixed some scattered bugs, added 50% chance to end up in deep space. 2012-02-29 13:48:16 -07:00
SkyMarshal
66f38fb34b TG UPDATE: Updates to telecomms, bug&runtime fixes, manifest for all, improved nuclear bomb. 
All PDA's can access the manifest.
Nuclear bomb now works on realtime.
Telecomms not mapped yet.
Numerous Runtime Fixes
 2012-02-28 18:24:43 -07:00
SkyMarshal
02002054de Teleporter has a cancel button. 
Improved the admin player panel.
Disposals now work right with things thrown at them.
Nuke upgraded to use realtime.
 2012-02-28 13:39:51 -07:00
SkyMarshal
b653c615be Replaced a lot of stupid from the wardrobes and package wrap, they now use an afterattack call instead of specific code for them in EVERY OTHER ITEM. 
Improved the admin panel.
Removed Karma.
 2012-02-28 00:11:15 -07:00
SkyMarshal
99aa041f11 Fixed some bugs, map update for Antiqua.dmm 2012-02-23 00:13:34 -07:00
SkyMarshal
b0eebb2edb Reverted some layer adjustments I did that seem to have broken things, bugfixes for operating tables, choking people, and CPR, giving. Also added sterile mask box sprite, and tossed the singularity crap into a spawn(0) to try and reduce lag. 2012-02-17 12:56:46 -07:00
SkyMarshal
429d13e980 Herp, derp made blood work right. 2012-02-05 11:22:05 -07:00
SkyMarshal
2074313f7f Updates to cigarettes and cigars 
Tables can now be thrown past
You can now put something in a disposal unit by throwing at it.
 2012-02-04 18:24:22 -07:00
SkyMarshal
16ac8ba8e0 Bugfixes. 2012-02-02 01:45:35 -07:00
Melvin Melonstorm
011a40cf91 Prevent delivery chute sound spam 2012-01-25 23:30:14 +01:00
Melvin Melonstorm
34c09891f6 Revert "Prevent the delivery chute from spamming the chute sound when several objects are flushed simultaneously." 
This reverts commit a356550d1b.
 2012-01-25 23:28:39 +01:00
Melvin Melonstorm
a356550d1b Prevent the delivery chute from spamming the chute sound when several objects are flushed simultaneously. 2012-01-25 23:03:31 +01:00
Albert Iordache
725ec31a57 Merge pull request #278 from caelaislinn/master 
Fixed disposals error from using a grab on a disposal chute.
 2012-01-13 11:52:53 -08:00
CaelAislinn
07fb3f1eb8 fixed error from using a grab on a disposal chute 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-13 21:51:16 +10:00
Albert Iordache
e3c4b0f88f Merge pull request #276 from SkyMarshal/master 
Weldpack added, not on map; Clipboards fit on belt; Wrapping is more robust.
 2012-01-12 11:43:39 -08:00
SkyMarshal
70cb3417ef Added weldpack, clipboards fit on belt, food and other things can now be wrapped 2012-01-12 11:13:05 -07:00
CaelAislinn
47451d9f53 conveyors in the mini outposts on the mining asteroid should now work properly 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-12 16:59:36 +10:00
Tastyfish
a85e8eee50 Merge pull request #271 from caelaislinn/master 
conveyors on the mini mining outposts should now work properly
 2012-01-11 23:03:00 -08:00
SkyMarshal
a47b399c32 Fixed bugs involving wrapping yourself in a closet. Added a new centcom uniform sprite, and added checks to keep them looking pretty. Added a cancel button to deathsquad button. Adjusted admin spawnable complete uniforms, so that centcom officials look pimp'n. Added a layer of internal armor (special invisible exosuit) that spawns on centcom officials. Centcom berets are no longer space helmets. Added missing reactive teleport armor sprite and fixed it's functionality. 2012-01-11 18:13:02 -07:00
Tastyfish
f922994c71 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	code/modules/recycling/sortingmachinery.dm
 2012-01-11 00:26:42 -05:00
Tastyfish
12a9c075c8 added overlays for labelled and tagged packages 2012-01-11 00:24:02 -05: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
SkyMarshal
f36c56f5c7 Disposal updates, fixed a messed up maintenance door. 2012-01-10 15:37:42 -07: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
Tastyfish
1d010aca75 Merge remote-tracking branch 'upstream/master' 2012-01-08 20:06:03 -05: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
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
SkyMarshal
5bd517bf72 Numerous fixes. 2012-01-05 14:33:29 -07:00
SkyMarshal
89df766f75 Finial stuff for the mail sorting shit. 2012-01-05 10:22:17 -07:00
SkyMarshal
98fc5872d3 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-05 09:45:20 -07:00
SkyMarshal
421b49c3f0 Reworked some stuff to actually... work 2012-01-05 09:39:44 -07:00
Albert Iordache
778c6d03e3 Merge pull request #218 from SkyMarshal/master 
Big edit!
 2012-01-05 07:56:30 -08:00
SkyMarshal
dd5c6b9250 Final fix, I think. 2012-01-05 01:02:44 -07:00
SkyMarshal
0f92684f8a Hopefully final commit. 2012-01-05 00:04:42 -07:00
SkyMarshal
582fe30ca8 Getting closer.... 2012-01-04 23:04:55 -07:00
SkyMarshal
20cbc642e2 Another update. 2012-01-04 23:02:57 -07:00
SkyMarshal
873857690d Unfinished commit with a few major changes. DO NOT MERGE. 
Signed-off-by: SkyMarshal
 2012-01-04 22:33:41 -07:00
CaelAislinn
75757a29cf fixed conveyors. was something weird happening with antiqua, shouldn't be any changes 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 15:30:15 +10: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
719c6a3b31 Don't ask me why this didn't work already, another runtime fixed 2012-01-04 03:22:07 +10:30
Tastyfish
3c15526e3f accidentally called the wrong unequip proc, they're all so similar! 2012-01-02 12:52:09 -05:00