Mark van Alphen
09da967bd1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/RandomZLevels/moonoutpost19.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
2019-04-18 03:15:52 +02:00
variableundefined
6125d73d64
Merge pull request #11314 from farie82/windoor-fix
...
Fixes windoors not spawning electronics once deconstructed
2019-04-18 07:51:13 +08:00
variableundefined
91da0c75a2
Merge pull request #11317 from farie82/cult-rune-scribe-fix
...
Can't place runes in space anymore
2019-04-18 07:50:35 +08:00
variableundefined
38d17a42a5
Merge pull request #11313 from farie82/tape-gag-fix
...
Fixes the tape gag still being there. Invinsible
2019-04-18 07:49:25 +08:00
variableundefined
391104fdb0
Merge pull request #11243 from CornMyCob/plasmacutter-buff
...
Makes the plasma cutter less shit
2019-04-18 07:35:27 +08:00
variableundefined
31a2779bae
Merge pull request #11259 from Markolie/flukeops
...
Nuke Ops updates and buffs
2019-04-18 07:16:31 +08:00
Mark van Alphen
6faf9c769f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# paradise.dme
2019-04-17 22:46:43 +02:00
Mark van Alphen
a0328e210d
Merge branch 'turfs' of https://github.com/Markolie/Paradise into turfs
2019-04-17 22:40:41 +02:00
Mark van Alphen
4c26388a8b
Remove white shuttle landing spot
2019-04-17 22:40:08 +02:00
joep van der velden
c567e6d1cd
Can't place runes in space anymore
2019-04-17 13:14:47 +02:00
joep van der velden
11abbd1ef2
Fixes windoors not spawning electronics once deconstructed
2019-04-17 12:09:20 +02:00
joep van der velden
9b0c5847b5
no qdel needed
2019-04-17 11:29:52 +02:00
joep van der velden
79de060cb0
Fixes the tape gag still being there. Invinsible
2019-04-17 11:22:15 +02:00
KasparoVy
489b10d47f
Runtime resolved
2019-04-16 19:43:56 -04:00
Mark van Alphen
73780fcb21
Spacing fix
2019-04-16 16:01:54 +02:00
variableundefined
0bc6859d7e
Merge pull request #11305 from Fox-McCloud/its-time
...
It's Time
2019-04-16 19:48:20 +08:00
variableundefined
ff9de147e1
Merge pull request #11287 from Fox-McCloud/fix-goats
...
Fixes and Updates Goats
2019-04-16 19:48:04 +08:00
variableundefined
eb83a2dee7
Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
...
Refactors Electrocution
2019-04-16 19:47:42 +08:00
variableundefined
546bd0edf5
Merge pull request #11288 from Fox-McCloud/toxins-remap
...
Remaps Toxins
2019-04-16 19:47:14 +08:00
variableundefined
b6c1026d74
Merge pull request #11297 from Fox-McCloud/update-gas-overlay
...
Updates and Fixes Gas Overlays and Icy Floor Change
2019-04-16 19:45:51 +08:00
variableundefined
46d32bf052
Merge pull request #11298 from Kyep/ban_fix
...
Fixes bans not saving properly
2019-04-16 19:45:32 +08:00
variableundefined
dc825a7bfa
Merge pull request #11231 from Arkatos1/Tips
...
Adds Tip of the round + Show Custom Tip admin verb + Give Random Tip OOC verb
2019-04-16 19:43:55 +08:00
variableundefined
e8b506be9b
Merge pull request #11304 from Markolie/claws
...
Remove infinite claw sharpening with whetstones
2019-04-16 19:42:08 +08:00
CornMyCob
1af7999dbd
lighting fix
2019-04-15 20:45:16 +01:00
Fox McCloud
3ff16da2e2
Merge pull request #11301 from KasparoVy/vox-undergarments
...
Adds Striped Normal-height Socks & All the Undergarments for Vox
2019-04-15 11:44:34 -04:00
Fox McCloud
7f00f8313a
It's Time
2019-04-14 18:24:48 -04:00
Mark van Alphen
a9fa2f32e1
Remove infinite claw sharpening
2019-04-15 00:01:08 +02:00
Mark van Alphen
e09956cc17
Dwarf legion fix
2019-04-14 22:31:25 +02:00
Mark van Alphen
2f38e94e77
Fix hivelord neck equipping
2019-04-14 22:12:34 +02:00
Mark van Alphen
e7e6752c54
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/controllers/master_controller.dm
# paradise.dme
2019-04-14 19:17:06 +02:00
AffectedArc07
4b49373051
Hopefully resets this
2019-04-14 16:58:29 +01:00
AffectedArc07
15e549fd7e
Supers seem super useful
2019-04-14 16:57:15 +01:00
AffectedArc07
57fb39016c
Stick it on my tab, barkeep
2019-04-14 16:57:15 +01:00
AffectedArc07
ae28500156
Init order changes
2019-04-14 16:56:06 +01:00
AffectedArc07
2304cf0f6f
SSMapping
2019-04-14 16:56:06 +01:00
variableundefined
2cb27da0c6
Merge pull request #11294 from farie82/ticket-span-closing
...
Adds the missing </span> elements in the ticket messages
2019-04-14 12:23:32 +08:00
KasparoVy
923614a475
Codes in the Undergarments, Final Sprite Tweaks & Armalis Fix
...
Removes the old Vox undergarments
Adds species_fitting of undergarments (making all the Vox versions usable) to update_icons and character setup preview
Disables undergarments for Armalis
Fixes & adjusts some Vox undergarment sprites based on testing results.
Removes flesh from shredded Vox uniform sprites.
2019-04-13 22:00:13 -04:00
Kyep
2726324dfa
removes non-IP ban option for legacy bans, because DB bans won't honor it regardless
2019-04-13 12:51:34 -07:00
Kyep
35a58864e4
add ip/cid to db bans
2019-04-13 12:44:45 -07:00
Fox McCloud
964bf03697
icy floors
2019-04-13 04:44:25 -04:00
joep van der velden
36f5c8ea14
let cmd_admin_pm handle the null client
2019-04-13 10:42:08 +02:00
Fox McCloud
6334114f8c
Updates and Fixes Gas Overlays
2019-04-13 01:44:05 -04:00
Mark van Alphen
1750d0b900
Change Syndicate Base DonkSoft vending machine to Syndicate appearance and Seed Vault fix
2019-04-13 03:25:33 +02:00
joep van der velden
9598dcac5e
fixed PM's
2019-04-13 00:57:59 +02:00
joep van der velden
a010f2e7e2
whoops
2019-04-12 23:46:35 +02:00
Fox McCloud
58a7107eae
shocking animals
2019-04-12 16:03:18 -04:00
Mark van Alphen
6a8035734e
Maximize fire protection on Ash Drake armour
2019-04-12 19:45:49 +02:00
Mark van Alphen
246d2099ae
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/__DEFINES/misc.dm
2019-04-12 19:44:31 +02:00
Mark van Alphen
36b74eeaea
Add proper config for ruins, helm fix, selfloop Lavaland
2019-04-12 19:41:31 +02:00
Mark van Alphen
6fcd95fa50
Compile fix
2019-04-11 22:16:27 +02:00
