Commit Graph

2420 Commits

Author SHA1 Message Date
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
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor
Refactors Electrocution
2019-04-16 19:47:42 +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
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
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Mark van Alphen
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
farie82
9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
Terror Spider tweaks
2019-04-07 20:30:48 +08:00
Arkatos1
5edc1378f8 New tips, renamed show tip verb, new Random Tip verb 2019-04-05 14:43:38 +02:00
Mark van Alphen
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
Mark van Alphen
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
Arkatos1
51c91337c2 Adds show tip admin verb and Tip of the round 2019-04-04 15:37:07 +02:00
variableundefined
449baf808b Merge pull request #11170 from Fox-McCloud/trick-revolver
Adds Trick Revolver
2019-04-02 18:33:24 +08:00
variableundefined
b208f7c17f Merge pull request #11177 from Ty-Omaha/Meaningful-Alerts
Makes "Start Now"'s confirmation meaningful
2019-04-02 18:30:43 +08:00
Mark van Alphen
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
Fox McCloud
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
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen
a05b37c5ca General Lavaland fixes, add Hierophant ruin 2019-03-31 01:12:10 +01:00
Ty-Omaha
64362f2d3b start_now 2019-03-30 10:34:03 -04:00
Arkatos1
8669ea1716 Removed Dark Matter for real, improved descriptions and added Blob Overminds to Check Antagonists verb 2019-03-30 15:00:12 +01:00
Fox McCloud
41eb7c2476 adminbus 2019-03-30 05:15:47 -04:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
Kyep
51c119660c add: shows admins details about growing eggs/spiders 2019-03-28 21:36:31 -07:00
joep van der velden
1131133d59 Confirmation 2019-03-17 10:17:39 +01:00
joep van der velden
3804de1f3b STAFF!!! 2019-03-10 09:05:06 +01:00
joep van der velden
af156a9eb8 made the my ticket verbs available for the normal players 2019-03-09 23:31:32 +01:00
joep van der velden
f9d01f396c Updated the closing permissions and added a new message for the closing of mhelps 2019-03-09 23:20:16 +01:00
joep van der velden
842615cd5b Fixed an ahelp follow up bug. Works now 2019-03-09 22:20:19 +01:00
joep van der velden
8d6cee7915 in between 2019-03-09 20:57:59 +01:00
Kyep
57d9b22675 Eventmob/specialrole v1.0 2019-03-08 02:08:24 -08:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles
also remove nukie flavor text and prevent golem targetting
2019-02-16 15:09:25 +00:00
variableundefined
d1ce7e6085 Merge pull request #10879 from datlo/stationdisk
Prevent ERT/Abductors/Traders/etc from stealing dat disk
2019-02-14 21:37:47 +08:00
datlo
b538a52da5 Prevent ERT/Abductors/ETC from stealing the NAD 2019-02-11 13:09:56 +00:00
AffectedArc07
40ba27b871 Adds an admin panel to force unlnik discord accounts 2019-02-10 12:21:30 +00:00
Kyep
00187ad971 Updates show player playtime report 2019-02-01 23:46:29 -08:00
Fox McCloud
f9aa125eb5 Merge pull request #10796 from Citinited/sexy-clowns-oh-god
Repaths sexy clown stuff to be subtypes of the existing clown items
2019-02-01 17:48:18 -05:00
Citinited
41ac5e0027 Repath of sexy clown gear: part 1 2019-02-01 21:46:58 +00:00
variableundefined
21cc9d882f Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE
I JUST CONFLICTED EVERYTHING
2019-01-31 11:03:33 +08:00
Alffd
110d3b17b4 Revert "Discord Bot Functionality" 2019-01-30 21:19:33 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
e13a536ddc Merge pull request #10585 from v0idp/discord_bot
Discord Bot Functionality
2019-01-29 10:43:51 +08:00
variableundefined
70ddb65f29 Merge pull request #9287 from Citinited/funny-chemicals
Adds a new clown chemical 🤡
2019-01-28 06:11:38 +08:00
Kyep
69b902503e Fixes admin co-ord jump 2019-01-26 18:40:53 -08:00
Citinited
4913f343ed Adds jestosterone component 2019-01-26 13:21:02 +00:00
datlo
6b43fae248 Add dusting implant 2019-01-21 13:24:06 +00:00
datlo
e15e68e32e adds hud 2019-01-20 18:08:53 +00:00
datlo
df6a9a4d8d properly remove bombs 2019-01-20 16:26:31 +00:00
datlo
783824b5e9 Updates SST, room, and shuttle
Changes to SST gear
- Added syndi internals box
- Replaced pressurized oxy tank by nukie jetpack
- Replaced reinforced spacesuit by reinforced elite hardsuit. Armor is
below dsquad armor, however you can turn it to combat mode, making you
much more mobile. Looks the same as the nukie elite hardsuit, for now, I
don't think it's a problem tho.
- Replaced pistol by syndicate revolver, aswell as the extra ammo. SST
can now print extra ammo at hacked autolathes to keep the fight going if
they run out due to this.
- Added a spare mag for the SAW
- Added a military belt (different color to match the hardsuit)
- Removed flashlight and EMP grenade
- Removed all access on SST IDs. They still get access to maintenance
and station exterior airlocks so they don't have to break in to enter
the station. They're still agent IDs, so you got syndi access, can copy
access, customize, etc.
A lot of this gear no longer spawns on the SST at spawn, and is instead
in the new SST lockers.
Admin outfitted SST are spawned with their full gear, which was also
updated.

Map changes
- Added 3 syndicate bombs beacons, a bomb detonator, 2 upgraded health
analyser, a syndi toolbox, 2 multitool to the SST ready room
- Added 6 SST lockers, containing EVA gear and SAW + ammo
- Fixed issues with the blast doors for the SIT and SST shuttles, both
sets of blast doors now open and close together, they can also be opened
from inside and outside the shuttle now. This lets you lock your shuttle
safely from anyone that doesn't have syndicate access, an emag, or can
just bypass the blast doors somehow.
- Added atmospherics blocking fans to the SIT and SST shuttle since they
don't have a cycling airlock and do not usually dock at a designated
docking station. This helps prevent the SIT (who do not start with EVA
gear) spacing themselves by going through the wrong door.
- Added an oxygen cannister and two syndicate sleepers to the SST
shuttle, removed the obsolete toxin bombs spawner (replaced by syndicate
bomb beacons in ready room)
2019-01-20 16:17:51 +00:00