cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-05 06:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,379 Commits 31 Branches 2 Tags
d5fc419a0d09151725f54e23ab77060ee00a1b81
Commit Graph

838 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Tastyfish
a2ff049861 merge 2012-01-04 23:01:22 -05:00
SkyMarshal
b2e25d39b8 This should work, not sure. 
Signed-off-by: SkyMarshal
 2012-01-04 11:08:47 -07: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
SkyMarshal
411ccc4075 Shitload of stuff. 2012-01-02 21:48:42 -07:00
SkyMarshal
fbf59a3411 Fix compile error. 2012-01-02 10:08:30 -07:00
SkyMarshal
2f0a745815 PDAs can now fit into all belts. 2012-01-02 10:01:57 -07:00
Tastyfish
bf877d0483 Merge pull request #191 from SkyMarshal/master 
Nuclear revamp, full details in description.
 2012-01-02 08:18:25 -08:00
Miniature
806a8d1c1a First bunch of emlocker stuffs, going to fix when its not 1am and 24C 2012-01-03 01:38:01 +10:30
Albert Iordache
d9683ef4e3 Merge pull request #192 from caelaislinn/master 
Autolathe changes, new supply crates, slight cargo bay tweaks
 2012-01-02 06:36:03 -08:00
CaelAislinn
fe228850c8 Added old BS12 walllockers and emergency lockers, added emergency lockers to tgstation208.dmm, removed stamp eraser from supply crate, minor antiqua tweaks 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 23:47:28 +10:00
CaelAislinn
9fa489a0d1 finished autolathe changes. added stationary, box and empty supply crates to supply shuttle. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 21:38:27 +10:00
CaelAislinn
083de044f3 Added production quantities and the ability to load + fill containers to the autolathe. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-02 20:19:15 +10:00
SkyMarshal
b30da1fa98 Some fixes and improvements. 2012-01-01 22:29:04 -07:00
SkyMarshal
d64e8284f6 Fixed implanter problems, added some more silly emotes. 2012-01-01 19:57:57 -07:00
SkyMarshal
d2bae46c39 Changed functionality of implanter. 2012-01-01 19:25:02 -07:00
SkyMarshal
755d2d711a Nuke revamp, some tweaking. 2012-01-01 18:58:28 -07:00
Tastyfish
343832e431 made it so nar-sie can't be objective if < 10 players, due to it being impossible 
also, made piano moveable
and cleaned up custom vote code slightly more
 2012-01-01 16:44:57 -05:00
Albert Iordache
47ada174be Merge pull request #182 from Tastyfish/master 
Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, status displays and light switches
 2011-12-31 11:38:31 -08:00
Tastyfish
c02979c148 Toggle-Deny-Shuttle, can build fire alarms, atmos alarms, intercoms, status displays, and light switches 2011-12-31 12:28:26 -05:00
Albert Iordache
977b37abde Fixed a runtime error. 2011-12-31 14:49:35 +02:00
SkyMarshal
1c54c8b20f Bugfix for alien removal surgery 2011-12-30 19:03:29 -07:00
cib
df4419da1e Changed the genetics manual. 2011-12-30 19:43:01 -08:00
SkyMarshal
0fe2cdab96 Added multiple string search to security records, fixed some evidence bag bugginess, fixed problem with the stamp remover. 2011-12-30 09:15:04 -07:00