cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-14 19:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,681 Commits 27 Branches 2 Tags
ec588a653e0ae0fe70ab28b751c0cfdfeeaeb83d
Commit Graph

737 Commits

Author SHA1 Message Date
Markolie
f1a4cf1dcf SMES (de)construction fixes 2015-08-12 22:14:47 +02:00
Mark van Alphen
8f19323fdd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms 
Conflicts:
	code/__HELPERS/lists.dm
 2015-08-03 23:59:45 +02:00
Fox-McCloud
c9ecbfd5d8 Merge pull request #1628 from Markolie/master 
Fix cable coil sprite
 2015-08-03 01:15:36 -04:00
Markolie
f213cf5501 Fix cable coil sprite 2015-08-03 06:37:12 +02:00
Markolie
2e3f4c63dd Solar control initialization fix 2015-08-03 01:14:06 +02:00
Markolie
b1b2f4ae92 Compile error fix 2015-08-03 00:58:10 +02:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms 
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
 2015-08-03 00:04:24 +02:00
Markolie
62f2f64063 Make SMES start empty, GC fix 2015-08-02 22:45:25 +02:00
Markolie
2a824c5fe0 Tweak electrocution damage from power gloves, GC update 2015-08-02 19:10:31 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
38b313a454 Engineering outpost solar update 2015-08-01 22:25:32 +02:00
Markolie
aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
 2015-08-01 21:44:47 +02:00
Markolie
0a4a2f34cf Map updates 2015-08-01 21:41:34 +02:00
Markolie
3afb9a75ad Upgraded pacman fix 2015-08-01 19:37:58 +02:00
Markolie
689a96f7ee GC fixes 2015-08-01 01:09:44 +02:00
Markolie
b3b226fd59 Fix some oversights 2015-08-01 00:52:04 +02:00
Markolie
f9d6bd33e6 SMES upgraded fix 2015-08-01 00:38:35 +02:00
Markolie
e055bbb847 SMES ghost access fix 2015-08-01 00:34:03 +02:00
Markolie
51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Markolie
3703210ba3 Ditch pacman2 code (unused) 2015-07-30 23:29:39 +02:00
Markolie
f939800c68 Update upgradable machinery New code 2015-07-30 22:19:32 +02:00
Markolie
267a95c327 Supermatter pathing fix 2015-07-30 03:10:09 +02:00
Markolie
660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/power/port_gen.dm
 2015-07-30 03:08:33 +02:00
DZD
51eca017ad Fixes based on feedback 2015-07-29 18:39:54 -04:00
Markolie
a1c22b6abd Fix incorrect pathing 2015-07-29 00:54:41 +02:00
Markolie
6fa10982e1 Span fixes 2015-07-29 00:53:02 +02:00
Markolie
9ce6884719 Pacman refactor/NanoUI 2015-07-29 00:41:54 +02:00
Markolie
69f7e04719 Prison break refactor, Requests Console refactor 2015-07-29 00:12:44 +02:00
Markolie
398bd40dfe Robot Control/supermatter NanoUI 2015-07-28 23:06:01 +02:00
Markolie
483d2b5864 Make more consoles accessible to ghosts 2015-07-27 23:40:23 +02:00
DZD
29e70854e9 Fix merge conflicts 
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
 2015-07-15 22:28:12 -04:00
Fox-McCloud
822dc6bac1 solar tweaks 2015-07-14 00:23:58 -04:00
Fox-McCloud
6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
DZD
412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD
916f9bf4bb Sort of compiles 
Time to fix xenoarch, and then the map.
 2015-07-09 15:55:36 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
ba163bef39 Makes Cables GC Better 2015-07-08 09:30:03 -04:00
Fox-McCloud
6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
TheDZD
db8767265a Merge pull request #1461 from Fox-McCloud/singulo-equipment 
Singulo Equipment Cleanup and Fixes
 2015-07-07 19:07:12 -04:00
Fox-McCloud
b9a492a3a5 no world 2015-07-06 23:25:29 -04:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys() 
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
 2015-07-06 09:20:39 -07:00
Fox-McCloud
3a44b3097f Singulo Equipment Cleanup 2015-07-06 01:07:08 -04:00
Fox-McCloud
389eab6e32 Analyzer Scan Refactor 2015-07-02 02:01:13 -04:00
ZomgPonies
7df2c7e71d Merge pull request #1427 from Fox-McCloud/supermatter 
TG Supermatter Port
 2015-07-01 23:49:19 -04:00
TheDZD
b8601761da Merge pull request #1418 from Fox-McCloud/light-power-fix 
Lights Use Power
 2015-07-01 17:52:47 -04:00
Fox-McCloud
a569c898e9 tweak 2015-06-30 21:24:26 -04:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud
246aff600e Lights Use Power 2015-06-29 21:15:22 -04:00