5b5e0a86a1
Add messages window
2019-05-06 12:13:58 -07:00
0c85b1790c
fixes merge conflict in paradise.dme
2019-05-04 22:59:00 -07:00
fb619648a9
Resolve conflicts
2019-05-03 22:28:04 -04:00
d98eb14a39
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/__DEFINES/misc.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
# code/modules/shuttle/shuttle.dm
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-04 03:16:38 +02:00
f3fb39b339
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
bbeb07abd2
More lighting fixes
2019-05-04 03:06:10 +02:00
5357e0e36f
Merge pull request #11428 from Markolie/bundles
...
Chameleon overhaul
2019-05-04 08:23:40 +08:00
6e79364b65
Here we go again
2019-05-03 21:47:07 +08:00
63980ff522
switches from flags=f to flags=b, for <130ms response time
2019-05-02 17:41:23 -07:00
b27f084eb8
Admin created cultists can now properly summon their Gods
...
Upon being made a cultist through admin means, the "summon spots" will now be generated, even if the game mode isn't cult. This allows admin created cultists to actually reach their goal of summoning their god, if it is what the admins told them to do.
2019-05-02 15:35:40 +02:00
e9d39b0d27
Chameleon overhaul
2019-05-01 20:59:41 +02:00
acf43fac3a
V2
2019-04-30 19:19:18 +01:00
ba0f6abb02
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# code/modules/power/cable.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# icons/obj/lighting.dmi
# paradise.dme
2019-04-30 19:26:17 +02:00
ec790efeaa
SSticker
2019-04-30 16:47:47 +01:00
07bd1b0cc0
fixes merge conflict
2019-04-30 00:54:49 -07:00
32376093cb
Merge pull request #11393 from Fox-McCloud/powernet-refactor
...
TG Powernet Refactor
2019-04-30 12:42:53 +08:00
7b57d2e319
fixups
2019-04-29 04:41:31 -04:00
efcfbbcf2d
Added checks now
2019-04-28 00:08:03 +02:00
86c8cf0c8b
PM's work again
2019-04-27 22:25:04 +02:00
a8db26df98
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-04-25 23:45:08 -04:00
ccef4d1187
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-04-24 02:55:32 +02:00
905fc7607a
Merge pull request #11328 from farie82/mhelp-rights-fix
...
Admins can now see the mhelp tickets
2019-04-23 20:46:34 +08:00
7eb7d723f9
Implement keybinding system and remove old hotkey modes
2019-04-23 01:31:03 -04:00
a35ba2fc5f
spacing
2019-04-22 18:52:50 -07:00
4561ee94f8
WIP ports XKeyScore from TG
2019-04-22 16:53:20 -07:00
4761ded0d4
Merge pull request #11350 from AffectedArc07/ss-everything
...
Gives the orphans a home
2019-04-21 18:44:38 -04:00
7fef96e38d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# paradise.dme
2019-04-21 23:27:23 +02:00
ff78ff1a9c
SScommunications
2019-04-21 20:12:14 +01:00
c16762c257
Kills air killing
2019-04-19 16:23:35 +01:00
89b0ffae6a
Admins can now see the mhelp tickets
2019-04-19 14:31:46 +02:00
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
52dff88bd9
Die monster! You don't belong in this world!
2019-04-17 16:30:43 +01:00
eb83a2dee7
Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
...
Refactors Electrocution
2019-04-16 19:47:42 +08:00
46d32bf052
Merge pull request #11298 from Kyep/ban_fix
...
Fixes bans not saving properly
2019-04-16 19:45:32 +08:00
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
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
35a58864e4
add ip/cid to db bans
2019-04-13 12:44:45 -07:00
90c9f3f479
Refacors Electrocution
2019-04-10 18:09:14 -04:00
f94796c125
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/items.dm
# icons/turf/floors/plating.dmi
# paradise.dme
2019-04-10 21:54:54 +02:00
9034f2a214
Merge branch 'master' into mhelp-ticket-system
2019-04-07 14:43:49 +02:00
86ea35c25b
Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
...
Terror Spider tweaks
2019-04-07 20:30:48 +08:00
5edc1378f8
New tips, renamed show tip verb, new Random Tip verb
2019-04-05 14:43:38 +02:00
a21ec0f30b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
99c470531f
Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional
2019-04-04 17:43:15 +02:00
51c91337c2
Adds show tip admin verb and Tip of the round
2019-04-04 15:37:07 +02:00
449baf808b
Merge pull request #11170 from Fox-McCloud/trick-revolver
...
Adds Trick Revolver
2019-04-02 18:33:24 +08:00
b208f7c17f
Merge pull request #11177 from Ty-Omaha/Meaningful-Alerts
...
Makes "Start Now"'s confirmation meaningful
2019-04-02 18:30:43 +08:00
500675be77
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# code/game/objects/structures/safe.dm
2019-04-02 00:54:49 +02:00
0b06a32cc9
Merge pull request #11165 from Markolie/issues
...
Resolve some issues that the compiler doesn't spot
2019-04-01 18:22:43 -04:00
1619bc048b
Lavaland baseturf implementation
2019-03-31 22:07:30 +02:00
tayyyyyyy