cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,256 Commits 12 Branches 2 Tags
1053acea64e1feebccbdd011ef1de253ff20b965
Commit Graph
3256 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert Iordache 1053acea64 Merge pull request #219 from caelaislinn/master 
new conveyors, diverters, partially fixed ultralight, new helper proc
 2012-01-05 04:37:16 -08:00
CaelAislinn a6c6c44112 ported z-levels from old bs12. ready for implementation into map/s 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 22:03:43 +10:00
CaelAislinn 0a70d83f57 re-adding fixed ul + new helper proc (get_opposite()) 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 15:37:02 +10: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
Tastyfish 3ac8b8bde7 Merge pull request #215 from Tastyfish/master 
retired admins don't get sent as admins in json
 2012-01-04 20:06:44 -08:00
Tastyfish 96bf25ad3e Merge remote-tracking branch 'upstream/master' 2012-01-04 23:02:22 -05:00
Tastyfish a2ff049861 merge 2012-01-04 23:01:22 -05:00
CaelAislinn 4c69787e37 Merge branch 'master' of github.com:caelaislinn/Baystation12 
Conflicts:
	code/game/events/Events/BlowOut.dm
	code/game/events/Events/ElectricalStorm.dm
	code/game/events/Events/PowerOffline.dm
	code/game/events/Events/RadiationBelt.dm
	code/game/events/Events/VirusEpidemic.dm
	code/game/events/EventsMain.dm
	code/game/gamemodes/gameticker.dm
	code/game/objects/radio/radio.dm
 2012-01-05 13:45:50 +10:00
Tastyfish f6706ef333 retired admins don't get sent as admins in json 2012-01-04 22:01:24 -05:00
CIB 9c8831541b Merge pull request #213 from Abi79/master 
Fixed a radiation belt runtime error
 2012-01-04 16:04:48 -08:00
CaelAislinn ab0d906883 played around with ultralight. it now works, but it overrides sd so don't include it. also, shitload of other 'changes' because i derped github 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-05 09:54:18 +10:00
Albert Iordache 7aac3d5e1c Fixed a radiation belt runtime error 2012-01-05 01:10:07 +02:00
Albert Iordache 86186aa089 Fixed a few occurrences of "ship" instead of "station", in events 2012-01-05 00:44:40 +02:00
cib e141f962c4 Confusion shouldn't make you totally unable to move in one direction. 2012-01-04 22:32:09 -08:00
cib cb78753345 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-04 22:10:37 -08:00
cib 66f6d325a4 Increased infection chance significantly in the hopes that this will somehow help vira not spreading. 2012-01-04 22:07:26 -08:00
cib 757bdc08f2 You can now produce infected blood from a virus dish with the cure research machine. 2012-01-04 19:16:35 -08:00
Tastyfish 14e9dbd779 a couple chatbot grammer improvements 2012-01-04 17:25:33 -05:00
Albert Iordache f7e22b104b Merge pull request #212 from CIB/master 
Make it possible to infect people from virus dishes
 2012-01-04 10:45:36 -08:00
CIB bd533a1a8a Merge pull request #211 from SkyMarshal/master 
Should help balance my last set of changes.
 2012-01-04 10:24:53 -08:00
SkyMarshal b2e25d39b8 This should work, not sure. 
Signed-off-by: SkyMarshal
 2012-01-04 11:08:47 -07:00
CIB 8865f71cb6 Merge pull request #209 from Abi79/master 
Fixed a case where the player panel wouldn't open
 2012-01-04 09:59:25 -08:00
Albert Iordache 4bd8c070d0 Merge pull request #210 from CIB/master 
control_freak bai
 2012-01-04 09:24:45 -08:00
cib 7b56f2e534 Disable control_freak, jesus. 2012-01-04 18:20:44 -08:00
Albert Iordache 0fd0ed6d4c Merge pull request #208 from Miniature/master 
Two more runtimes, also atmos computer stuff
 2012-01-04 04:31:16 -08:00
Albert Iordache 9c2224e6d8 Fixed a case where the player panel wouldn't open 
This shouldn't even happen :O
 2012-01-04 14:29:16 +02:00
Miniature 5a5c620692 Now atmos alarms automatically let atmos techs change them if they go off, as well as people can turn that off or make them permamently controllable by the computer 
also made it possible for them to mess with any alarm that hasn't had the atmos control completely disabled, but not a way to turn that feature on
 2012-01-04 22:52:01 +10:30
Albert Iordache 5d062a4229 Merge pull request #206 from Abi79/master 
Added directional sprites for the kitchen shutters
 2012-01-04 01:23:46 -08:00
Miniature ea70303f21 Another one 2012-01-04 17:02:35 +10:30
Miniature a898a49c3c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-01-04 17:00:34 +10:30
Miniature c9a20d7a12 another runtime 2012-01-04 16:57:40 +10:30
CaelAislinn 3f6e2c28d4 sync 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-04 11:55:04 +10:00
CaelAislinn 12cd38d5da Tweaked antiqua cargobay/diverters. UI bug (?) unreproduceable. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-04 11:48:39 +10:00
Albert Iordache 921999ef42 Added directional sprites for the kitchen shutters. 2012-01-04 00:02:57 +02:00
Albert Iordache 33833b9acb Merge pull request #202 from SkyMarshal/master 
OHMYGOD I coded a ton.
 2012-01-03 11:14:20 -08:00
SkyMarshal f78e044226 Tweaked electrical storms 2012-01-03 12:09:02 -07:00
SkyMarshal 1750d044cf Added blowout, easier management of disallowed events. 2012-01-03 12:03:14 -07:00
SkyMarshal 5b0dc3bf04 Merge pull request #205 from Miniature/master 
Merging bugfix.
 2012-01-03 10:17:48 -08:00
Miniature 499198b1cf More runtime fixing 2012-01-04 04:36:21 +10:30
Albert Iordache 511c9f761c Added more shutters to the kitchen. 2012-01-03 19:53:29 +02: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
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
CaelAislinn 5e9aa8b0cb New tg conveyors are working pretty well, just remember to define dir (conveyor sprite dir), forwards + backwards (conveyor movement dirs) when placing them. Diverters are in, but not working. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-04 01:25:58 +10:00
CaelAislinn 59b4bedfb2 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-01-04 00:12:56 +10:00
CaelAislinn 25af6373c4 added get_opposite(var/dir) to helpers.dm, new diverters / conveyors 95% working, antiqua cargo bay had to be tweaked. 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
 2012-01-04 00:11:26 +10:00
Albert Iordache c64d95d6d2 TG update: icons/obj/recycling.dmi 2012-01-03 16:08:23 +02:00
SkyMarshal 9a651a5a84 Added psyche jumpsuit for Asanadas 
Expanded scrambled radio stuff.
 2012-01-03 00:06:25 -07:00
SkyMarshal 120607828e Fixed random AI laws. 2012-01-02 22:39:42 -07:00