a8aef39625
enabled slaughter demon event
2017-02-10 17:32:11 +04:00
bbe7663e21
fixed enter_link
2017-02-06 20:22:08 +04:00
cd865ac1f2
revert immovable rod announcement change
2017-02-06 18:56:23 +04:00
332deb840e
Merge remote-tracking branch 'remotes/upstream/master' into events
...
# Conflicts:
# code/modules/events/immovable_rod.dm
2017-02-05 14:04:45 +04:00
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
1943f059c5
Requested changes
2017-02-03 23:41:04 -05:00
391976f7ed
I thought i deleted you....
2017-02-03 17:14:44 -05:00
37573a4339
Bugfix
2017-02-03 17:05:37 -05:00
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
3d587dea5b
Merge pull request #6177 from uraniummeltdown/new
...
Cyborg Blueprints
2017-02-02 00:50:33 -05:00
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
7259e4ce07
blueprints for engiborgs
2017-01-31 19:22:29 +04:00
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -05:00
c9b4a951ae
Merge pull request #6178 from FalseIncarnate/NTPS
...
NTPS: Requests Console Based Shipping
2017-01-31 01:26:21 -05:00
d76df747c5
Merge pull request #6272 from Markolie/fixxxxx
...
Give brains Galactic Common language
2017-01-30 22:02:34 -08:00
dcc3df2118
Merge pull request #6278 from tigercat2000/saycodefix
...
Add slot_collar, remove simple_animal add_inv/remove_inv
2017-01-30 22:01:27 -08:00
e7e22f5dff
Merge pull request #6273 from Kyep/names_fix
...
Fixes some mobs being invisible in Check_antagonists
2017-01-30 21:59:33 -08:00
154e08bf10
Merge pull request #6282 from Kyep/ca_initial_xenos
...
Fixes initial Xenomorphs not appearing in Check Antagonists
2017-01-30 21:56:09 -08:00
0283e75fe5
Merge pull request #6254 from FlattestGuitar/erifle
...
Adds a laser carbine!
2017-01-31 00:43:15 -05:00
4842d77882
Merge pull request #6239 from Ar3nn/cluwnescanbreathetoo
...
Cluwne Mask now allows internals usage
2017-01-30 23:46:42 -05:00
ab6fffa4dc
Removes Oudated GC Info
2017-01-30 03:01:29 -05:00
6d6eec5934
Fixes initial Xenomorphs not appearing in Check Antagonists
2017-01-29 18:48:51 -08:00
4e56bb9636
Add slot_collar, remove simple_animal add_inv/remove_inv
...
This is being done to remove the simple_animal/Topic() override.
2017-01-29 13:26:54 -08:00
46f409ddfb
Fixes some mobs being invisible in Check_antagonists
2017-01-28 15:25:20 -08:00
d65cc380fa
Give brains Galactic Common language
2017-01-29 00:06:00 +01:00
d7ae5c4a7e
Merge pull request #6266 from Fox-McCloud/pill-fix
...
Fixes Dental Pill being an internal organ
2017-01-28 01:40:26 -08:00
e1e0824418
Merge pull request #6202 from uraniummeltdown/xenobio
...
Slime Transference Potion
2017-01-27 20:18:19 -05:00
b24be686d0
Fixes Dental Pill being an internal organ
2017-01-27 20:02:06 -05:00
04d1b30a7b
Merge pull request #6199 from Fox-McCloud/stun-gloves
...
Adds in Stun Gloves
2017-01-27 16:57:13 -08:00
79e1953f41
Fixes a weird runtime. I think.
2017-01-28 00:48:05 +01:00
a653732219
Sound fixes
2017-01-27 17:47:56 +01:00
ab4703623c
Review changes
2017-01-27 17:46:38 +01:00
1d7de41acb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/pooling/pool.dm
2017-01-27 17:28:14 +01:00
c27454497a
increased playercount delay
2017-01-26 20:47:16 +04:00
f85f295f09
spacingggg
2017-01-26 08:15:42 -05:00
25dbef3e40
Merge pull request #6175 from Allfd/RigPort
...
Ports MarsM0nd's RIG suit fixes.
2017-01-26 07:33:15 -05:00
0959e819ec
Merge pull request #6237 from Fox-McCloud/no-pooling
...
Fires all Lifeguards, Bans Diving, and Forbids Swimming...
2017-01-26 03:48:35 -08:00
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
692f2d238b
Adds a laser carbine!
...
Admin only for now.
2017-01-26 12:45:36 +01:00
8ee22e320a
logging changes
...
as requested by mark
2017-01-25 23:44:27 -05:00
29e46d20c1
Removes commented out code
...
Removes commented out code
2017-01-25 19:47:31 -05:00
a4037ad426
Rigging Lights and Cells now works with Plasma Dust
...
Light bulbs, light tubes, and power cells can now be rigged with plasma
dust from grinding plasma sheets as well as the standard plasma reagent
from a chem dispenser. Both reagents require at least 5u of the reagent
to be injected at once to rig the bulb/tube/cell to explode.
If a rigged cell is inserted into a stunprod, it only explodes when you
actually attempt to stun something with it, not when you turn the prod
on. This was unchanged, but I'm mentioning it so people don't think I
changed that.
Fixes #6238
🆑
tweak: Plasma dust can now be used to rig lights and power cells, like
the plasma reagent, with explosive results.
/🆑
2017-01-24 19:47:18 -05:00
364a78f013
what
2017-01-23 13:00:43 -05:00
1eec76088b
tweaked playercount and decreased morph weight
2017-01-23 21:52:45 +04:00
f1f545d780
Revert "cluwne mask now allows internals"
...
This reverts commit 42308aa798
2017-01-23 12:44:48 -05:00
a7205cfd3e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/projectiles.dmi
2017-01-23 17:36:37 +01:00
263c95b65c
Merge pull request #6234 from FalseIncarnate/bug_fix
...
Allows shovels/spades to remove soil patches
2017-01-23 06:44:34 -05:00
2af1f9bb79
Merge pull request #6185 from Allfd/Enforcer
...
Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
2017-01-23 06:08:36 -05:00
9709b4ddfa
Merge pull request #6219 from Crazylemon64/tg_mapconflict_helper
...
Tg mapconflict helper
2017-01-23 06:04:52 -05:00
ea15a83fde
Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage
2017-01-23 01:56:47 -05:00
uraniummeltdown