ea0190debe
Merge pull request #1648 from tigercat2000/MARKPLEASE
...
Shorten Change-mob-appearance name to ensure extra columns
2015-08-06 16:42:04 -04:00
ba5115b7e9
Merge pull request #1646 from FalseIncarnate/master
...
Botany Modular Icon Revert, also Peanuts
2015-08-06 16:41:46 -04:00
395646edbe
Merge pull request #1653 from Markolie/alarms
...
Runtime/bug fixes
2015-08-06 16:40:18 -04:00
fd9ca9102c
Runtime fixes
2015-08-06 18:40:00 +02:00
050e111157
Merge pull request #1603 from TheDZD/shadowling
...
Shadowling Updates
2015-08-05 20:26:25 -04:00
7637fe9582
Finalizes Changes
...
- Adds action buttons for Shadowling spells
- Fixes bugs and runtimes found while testing.
- Remove stupid snowflake check that allowed mobs with environment_smash
>= 2 to smash reinforced walls, but not regular walls (what the actual
fuck?).
2015-08-05 18:22:01 -04:00
f7ffcfab1d
Shorten Change-mob-appearance name to prevent extra columns
2015-08-05 14:34:46 -07:00
fb203fe569
Botany Modular Icon Revert, also Peanuts
...
Removes modular sprites from nearly all pre-defined seed products.
- The following plants still utilize modular icons:
- Random Seeds (Strange Plants)
- Grass
- S'randar's Hand leaves
- Messa's Tear leaves
- Telriis Grass
- Thaa'dra Lichen
- Jurl'mah Reeds
- Amauri Plant
- Gelthi Plant
- Vale Bush
- Surik Vine
- Test and Test 2
Added a new plant, peanuts!
- Seeds available from MegaSeed vendor in hydroponics
- Will be included in future kitchen recipes in a separate PR
2015-08-05 05:05:26 -04:00
930dde6e78
Merge pull request #1645 from Fox-McCloud/quick-fix
...
Imprinter Runtime Fix
2015-08-04 21:24:39 -04:00
212a0ef643
Imprinter Runtime Fix
2015-08-04 21:13:20 -04:00
697292b164
Merge pull request #1639 from Fox-McCloud/dem-tails
...
Vulpkanin Tail Fix
2015-08-04 18:10:41 -04:00
27388d4763
Vulpkanin Tail Fix
2015-08-04 17:57:11 -04:00
f1f0805619
Makes Disposals GC
2015-08-04 17:03:56 -04:00
fb381e5d84
Merge pull request #1626 from TheDZD/wiznerd
...
Adminboooooooooooooos
2015-08-03 21:19:21 -04:00
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
82f62da60f
Merge pull request #1604 from TheDZD/helper
...
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
080b1b30db
Merge pull request #1612 from Markolie/appearancechanger
...
Ports Bay's appearance changer
2015-08-03 17:30:58 -04:00
429ba1b92b
Merge pull request #1630 from Markolie/master
...
Mecha turret fix
2015-08-03 16:37:41 -04:00
b4c5e8bf6b
Mecha turret fix
2015-08-03 22:21:19 +02:00
625b529484
Fix conflicts
2015-08-03 11:28:24 -04:00
1a15dbd432
Adminboooooooooooooos
2015-08-03 11:25:37 -04:00
d9bb30f47a
Replaces typesof with subtypesof where applicable
2015-08-03 11:04:28 -04:00
c9ecbfd5d8
Merge pull request #1628 from Markolie/master
...
Fix cable coil sprite
2015-08-03 01:15:36 -04:00
f213cf5501
Fix cable coil sprite
2015-08-03 06:37:12 +02:00
a2f8141036
NanoUI power monitor/AI subsystem, mapfix
2015-08-03 03:38:38 +02:00
2e3f4c63dd
Solar control initialization fix
2015-08-03 01:14:06 +02:00
b1b2f4ae92
Compile error fix
2015-08-03 00:58:10 +02:00
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
7d806cbd12
Merge pull request #1602 from Markolie/powernet
...
Powernet rework
2015-08-02 17:26:37 -04:00
aaa6170fe4
Lighting Runtime Fix
2015-08-02 16:57:14 -04:00
62f2f64063
Make SMES start empty, GC fix
2015-08-02 22:45:25 +02:00
be9ea0b540
Alarm system tweaks
2015-08-02 19:20:37 +02:00
2a824c5fe0
Tweak electrocution damage from power gloves, GC update
2015-08-02 19:10:31 +02:00
4360b5a867
Remove debug proc
2015-08-02 07:14:12 +02:00
73e94b5dc4
Alarm system overhaul
2015-08-02 07:13:03 +02:00
809c34eeb2
Fix xeno icons getting stuck due to impossible check
2015-08-01 20:27:10 -07:00
e35431da34
Port Bay's appearance changer
2015-08-01 23:22:20 +02:00
38b313a454
Engineering outpost solar update
2015-08-01 22:25:32 +02:00
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
0a4a2f34cf
Map updates
2015-08-01 21:41:34 +02:00
4028c2af12
Merge pull request #1611 from Fox-McCloud/dview
...
DVIEW Lighting Fixes
2015-08-01 15:34:36 -04:00
1344de844b
DVIEW Fixes
2015-08-01 15:20:44 -04:00
2c1d0ea7d4
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:41:11 +02:00
3afb9a75ad
Upgraded pacman fix
2015-08-01 19:37:58 +02:00
dd067f582a
Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +02:00
10ceb14432
Merge pull request #1608 from TheDZD/mining2
...
Diamond Drill and Drone Fixes
2015-08-01 13:13:02 -04:00
ba82f03d7c
Drill and drone fixes
...
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
2015-08-01 10:13:54 -04:00
79613f5121
Merge pull request #1591 from Markolie/mech_recharger
...
Refactor mech recharger
2015-07-31 22:03:16 -04:00
70ed700e24
Make sure mask is selected
2015-08-01 01:56:17 +02:00
008f35d87b
When masks are adjusted, allow CPR
2015-08-01 01:45:51 +02:00
Fox-McCloud