cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 07:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,474 Commits 29 Branches 2 Tags
e18838ffa449a4cc3b0c9727f1a30f6e6a69af62
Commit Graph

10202 Commits

Author SHA1 Message Date
Fox-McCloud
395646edbe Merge pull request #1653 from Markolie/alarms 
Runtime/bug fixes
 2015-08-06 16:40:18 -04:00
Mark van Alphen
fd9ca9102c Runtime fixes 2015-08-06 18:40:00 +02:00
Fox-McCloud
050e111157 Merge pull request #1603 from TheDZD/shadowling 
Shadowling Updates
 2015-08-05 20:26:25 -04:00
DZD
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
TheDZD
930dde6e78 Merge pull request #1645 from Fox-McCloud/quick-fix 
Imprinter Runtime Fix
 2015-08-04 21:24:39 -04:00
Fox-McCloud
212a0ef643 Imprinter Runtime Fix 2015-08-04 21:13:20 -04:00
TheDZD
697292b164 Merge pull request #1639 from Fox-McCloud/dem-tails 
Vulpkanin Tail Fix
 2015-08-04 18:10:41 -04:00
Fox-McCloud
27388d4763 Vulpkanin Tail Fix 2015-08-04 17:57:11 -04:00
Fox-McCloud
f1f0805619 Makes Disposals GC 2015-08-04 17:03:56 -04:00
Fox-McCloud
fb381e5d84 Merge pull request #1626 from TheDZD/wiznerd 
Adminboooooooooooooos
 2015-08-03 21:19:21 -04: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
82f62da60f Merge pull request #1604 from TheDZD/helper 
Subtypesof Helper Proc
 2015-08-03 17:44:01 -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
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
625b529484 Fix conflicts 2015-08-03 11:28:24 -04:00
DZD
1a15dbd432 Adminboooooooooooooos 2015-08-03 11:25:37 -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
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
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
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
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
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
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
Markolie
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
Markolie
3afb9a75ad Upgraded pacman fix 2015-08-01 19:37:58 +02:00
Markolie
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
Fox-McCloud
10ceb14432 Merge pull request #1608 from TheDZD/mining2 
Diamond Drill and Drone Fixes
 2015-08-01 13:13:02 -04:00
DZD
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
Fox-McCloud
79613f5121 Merge pull request #1591 from Markolie/mech_recharger 
Refactor mech recharger
 2015-07-31 22:03:16 -04:00
Markolie
70ed700e24 Make sure mask is selected 2015-08-01 01:56:17 +02:00
Markolie
008f35d87b When masks are adjusted, allow CPR 2015-08-01 01:45:51 +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