cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,555 Commits 26 Branches 2 Tags
a522d0a86feebc0af48b125cedbec0f8ac5dc2c8
Commit Graph

5125 Commits

Author SHA1 Message Date
Markolie
a522d0a86f Enable ventcrawling for slimes 2015-08-09 18:14:19 +02:00
Markolie
bddfb7029d Make sure special_role is assigned in pre_setup 2015-08-09 18:12:14 +02:00
Fox-McCloud
541c662296 Merge pull request #1540 from Krausus/ProcessSchedulerTweaks 
Process and Process Scheduler Tweaks
 2015-08-08 20:46:23 -04:00
DZD
16bdb00351 Nukes useless /wizard/ spell pathing 
This had no fucking reason to exist, Shadowling spells are not wizard
spells, genetics powers are not wizard spells, ghost Booing is not a
wizard spell, etc.
 2015-08-08 14:06:50 -04:00
Fox-McCloud
5ce0ae0516 Fixes Movement Speed Modifiers 2015-08-08 04:15:41 -04:00
TheDZD
171c0d2d6c Merge pull request #1387 from Aurorablade/STILLALOTOFBLOOD 
[Need Feedback] TG Slaughter Demon Port Remake, THE REGIBBINGING
 2015-08-07 18:19:38 -04:00
Aurorablade
bec3b6bf6e Typo and color macro fix 2015-08-06 23:57:34 -04:00
TheDZD
70fc864ce8 Merge pull request #1651 from Fox-McCloud/shadowling-surgery-and-fixes 
Shadowling Surgery and Fixes
 2015-08-06 19:21:38 -04:00
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
Aurorablade
95565847b7 Changes 
Revert to the orignal TG method of just shoving a player into the daemon
on vial break.

did the same for the event (i still like using the revenant spawns
rather then carp spawns for that, not as disoriniting to me)

Added reference to BLOODCRAWL_EAT i missed

Devouring now heals more types of damage

Removes some gore abilitys...I got overzealous in wanting
blood....Keeping the spooky demon head whisper...
No don't ask why i called it Pustle...My brain frightens me...
 2015-08-06 01:56:59 -04:00
Fox-McCloud
5ae43f0875 Shadowling Surgery and Fixes 2015-08-05 21:52:17 -04: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
Fox-McCloud
27388d4763 Vulpkanin Tail Fix 2015-08-04 17:57:11 -04:00
Krausus
60fed2cf71 Resolves further merge conflicts 2015-08-03 23:40:28 -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
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie
a2f8141036 NanoUI power monitor/AI subsystem, mapfix 2015-08-03 03:38:38 +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
Markolie
be9ea0b540 Alarm system tweaks 2015-08-02 19:20:37 +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
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
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
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
DZD
e5b619783b Fixes merge conflicts 2015-07-31 18:25:00 -04:00
DZD
ed24ac47de Up to date with -tg- 
- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.
 2015-07-31 18:15:45 -04:00
Aurorablade
79f3bf810f Hopefully last commit? 2015-07-31 15:49:39 -04:00
TheDZD
545855e182 Merge pull request #1600 from Fox-McCloud/revenant-fix 
Revenant Death Fix
 2015-07-31 14:24:01 -04:00
Fox-McCloud
e573f73547 Revenant Death Fix 2015-07-31 13:56:41 -04:00
Fox-McCloud
151d8d3229 Merge pull request #1585 from Markolie/headlamp 
Add borg headlamp, add movement states for some borgs, add jetpack overlay to all miner borgs
 2015-07-31 13:34:53 -04:00
DZD
a66c91a4da Fixes hivelord infinitely dropping cores 
Don't know how I forgot about this one.
 2015-07-31 11:40:13 -04:00
DZD
36221a3c69 Update to tgstation/-tg-station#10254 2015-07-31 11:31:21 -04:00
TheDZD
6ab29c1038 Merge pull request #1592 from veganzombeh/flutterby 
Fixes a butterfly typo.
 2015-07-30 19:19:39 -04:00
veganzombeh
a6b3287fb7 Aquashes to squashes 2015-07-30 23:47:16 +01:00
Markolie
c2cbaa7627 Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs 2015-07-30 19:33:49 +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
Fox-McCloud
1ee7853d65 Merge pull request #1476 from TheDZD/mining2 
Mining Overhaul [Soon™]
 2015-07-29 20:51:24 -04:00
DZD
284c562bc0 Plasmamen 
- Mining plasmaman spacesuit now has the same slowdown as a mining RIG,
but can now be upgraded with Goliath hide plates.
 2015-07-29 18:57:39 -04:00
DZD
c11effafa0 Fixes and minor change 
- Fixes goliaths infinitely dropping hides.
- Makes the basilisk anti-infinidrop bug not use a var specifically for
it, and instead just check if the mob is already dead before trying to
drop (living basilisks will drop items, THEN die).
- Minor mapping changes (added lights I forgot to add to previously
changed areas, made the entrance area of the western mining outpost
slightly larger and added another air vent to it.)
 2015-07-29 17:14:00 -04:00
Aurorablade
d962bf6b7d CRAWL! 
Made changes based on feedback.
 2015-07-29 16:42:51 -04:00