 Fox-McCloud
|
212a0ef643
|
Imprinter Runtime Fix
|
2015-08-04 21:13:20 -04:00 |
|
|
Fox-McCloud
|
e8ece032c9
|
Merge pull request #1635 from tigercat2000/plaintextisbadsometimes
Replace (TM) in mirror title with actual TM character
|
2015-08-03 21:25:33 -04:00 |
|
|
Fox-McCloud
|
fb381e5d84
|
Merge pull request #1626 from TheDZD/wiznerd
Adminboooooooooooooos
|
2015-08-03 21:19:21 -04:00 |
|
|
Mark van Alphen
|
43ec3266c8
|
This should fix the conflict
|
2015-08-04 00:03:14 +02:00 |
|
|
Mark van Alphen
|
138212e434
|
Damn it, Git
|
2015-08-04 00:01:31 +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 |
|
|
Tigercat2000
|
b8be8cb4ca
|
Replace (TM) in mirror title with actual TM character)
|
2015-08-03 14:53:28 -07:00 |
|
|
Fox-McCloud
|
82f62da60f
|
Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
|
2015-08-03 17:44:01 -04:00 |
|
|
TheDZD
|
525955d8bf
|
Merge pull request #1632 from Fox-McCloud/scheduler-tweaks
Process Scheduler Tweaks
|
2015-08-03 17:36:19 -04:00 |
|
|
Fox-McCloud
|
080b1b30db
|
Merge pull request #1612 from Markolie/appearancechanger
Ports Bay's appearance changer
|
2015-08-03 17:30:58 -04:00 |
|
|
Mark van Alphen
|
027686ba52
|
Buff scrubbers and add widenet 3x3 scrubbing
|
2015-08-03 23:22:25 +02:00 |
|
|
Fox-McCloud
|
62e8889353
|
Process Scheduler Tweaks
|
2015-08-03 17:15:12 -04:00 |
|
|
Fox-McCloud
|
fdf16bcdfa
|
Pod Door Fix
|
2015-08-03 16:48:01 -04:00 |
|
|
Fox-McCloud
|
429ba1b92b
|
Merge pull request #1630 from Markolie/master
Mecha turret fix
|
2015-08-03 16:37:41 -04:00 |
|
|
Mark van Alphen
|
b4c5e8bf6b
|
Mecha turret fix
|
2015-08-03 22:21:19 +02:00 |
|
|
DZD
|
445b65c13f
|
Fixes parenthesis
|
2015-08-03 11:56:52 -04:00 |
|
|
DZD
|
625b529484
|
Fix conflicts
|
2015-08-03 11:28:24 -04:00 |
|
|
DZD
|
1a15dbd432
|
Adminboooooooooooooos
|
2015-08-03 11:25:37 -04:00 |
|
|
TheDZD
|
b28b8d267f
|
Merge pull request #1617 from tigercat2000/misc-tg-stuff
Adds a proc to allow any /atom/movable to smoothly orbit an /atom
|
2015-08-03 11:23:26 -04:00 |
|
|
DZD
|
d9bb30f47a
|
Replaces typesof with subtypesof where applicable
|
2015-08-03 11:04:28 -04: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
|
122cec7d42
|
Tweak Vox alarm mode
|
2015-08-03 04:17:26 +02:00 |
|
|
Markolie
|
a2f8141036
|
NanoUI power monitor/AI subsystem, mapfix
|
2015-08-03 03:38:38 +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 |
|
|
Fox-McCloud
|
7d806cbd12
|
Merge pull request #1602 from Markolie/powernet
Powernet rework
|
2015-08-02 17:26:37 -04:00 |
|
|
Fox-McCloud
|
aaa6170fe4
|
Lighting Runtime Fix
|
2015-08-02 16:57:14 -04:00 |
|
|
Markolie
|
62f2f64063
|
Make SMES start empty, GC fix
|
2015-08-02 22:45:25 +02:00 |
|
|
Markolie
|
161a450d76
|
Air alarm emag support
|
2015-08-02 22:39:13 +02:00 |
|
|
Markolie
|
5f95452f55
|
Air alarm LINDA support
|
2015-08-02 22:25:11 +02:00 |
|
|
Fox-McCloud
|
a022f14a4a
|
Merge pull request #1607 from FalseIncarnate/master
Removes explosion immunity from chameleon projector
|
2015-08-02 14:55:06 -04:00 |
|
|
Markolie
|
be9ea0b540
|
Alarm system tweaks
|
2015-08-02 19:20:37 +02:00 |
|
|
Markolie
|
2a824c5fe0
|
Tweak electrocution damage from power gloves, GC update
|
2015-08-02 19:10:31 +02:00 |
|
|
TheDZD
|
382c0f61dd
|
Merge pull request #1619 from Fox-McCloud/nuke-ops-fix
Fixes Nuke Ops Energy Sword/Shield Uplink Purchase
|
2015-08-02 11:18:09 -04:00 |
|
|
Fox-McCloud
|
330e5c0c8d
|
Fixes Nuke Ops Energy Sword/Shield Uplink Purchase
|
2015-08-02 02:11:03 -04:00 |
|
|
Markolie
|
4360b5a867
|
Remove debug proc
|
2015-08-02 07:14:12 +02:00 |
|
|
Markolie
|
73e94b5dc4
|
Alarm system overhaul
|
2015-08-02 07:13:03 +02:00 |
|
|
Remie RichardsandTigercat2000
|
8856dfcf01
|
Adds a proc to allow any /atom/movable to smoothly orbit an /atom
|
2015-08-01 21:57:38 -07:00 |
|
|
Tigercat2000
|
809c34eeb2
|
Fix xeno icons getting stuck due to impossible check
|
2015-08-01 20:27:10 -07:00 |
|
|
Markolie
|
e35431da34
|
Port Bay's appearance changer
|
2015-08-01 23:22:20 +02:00 |
|
|
Markolie
|
7d1f077378
|
Fix https://github.com/ParadiseSS13/Paradise/issues/1350
|
2015-08-01 23:01:50 +02:00 |
|
|
Markolie
|
8e03775eec
|
Floodlight power cell fix
|
2015-08-01 22:58:45 +02:00 |
|
|
Markolie
|
38b313a454
|
Engineering outpost solar update
|
2015-08-01 22:25:32 +02:00 |
|
|
FalseIncarnate
|
4b84d7ebd8
|
spawn() added to ex_act
|
2015-08-01 15:48:29 -04: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 |
|
|
TheDZD
|
4028c2af12
|
Merge pull request #1611 from Fox-McCloud/dview
DVIEW Lighting Fixes
|
2015-08-01 15:34:36 -04:00 |
|
|
Fox-McCloud
|
1344de844b
|
DVIEW Fixes
|
2015-08-01 15:20:44 -04:00 |
|