cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,035 Commits 26 Branches 2 Tags
ff467b984e96c1f44df9fc0d1472683cbb0ea71b
Commit Graph

1881 Commits

Author SHA1 Message Date
TheDZD
a34f6a9877 Merge pull request #5437 from Fox-McCloud/remove-mutiny 
Removes Mutiny
 2016-08-14 22:34:25 -04:00
Fox-McCloud
3dcc4bdecd Removes Mutiny 2016-08-12 22:44:11 -04:00
Fox-McCloud
18a6523b68 Fixes Start Singulo 2016-08-12 20:48:59 -04:00
TheDZD
e944f176d6 Merge pull request #5418 from Fox-McCloud/malf-ai-rework 
Malf AI Rework
 2016-08-12 18:30:41 -04:00
Fox McCloud
a0520862d6 Merge pull request #5403 from monster860/red-blue-fix-4real 
Makes boldnotice and danger classes be be used
 2016-08-11 17:36:52 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Krausus
daad598b87 Fixes access on "equip as job..." IDs 2016-08-10 22:35:53 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox McCloud
b1c87f319d Merge pull request #5316 from Crazylemon64/map_writer 
Adds a "Save" buildmode
 2016-08-08 02:34:02 -04:00
Earthdivine
bd4fa6de04 Changed "Send in a strike team" to "Send in the Deathsquad." for more clarity. 2016-08-05 18:19:11 -05:00
Fox McCloud
7476da1c49 Merge pull request #5294 from yurivw/shuttleoptions 
Removed unused options in secrets menu
 2016-08-04 17:48:41 -04:00
Krausus
e9886d05fc Human overlay caching and minor overlay fixes 2016-08-04 11:14:56 -04:00
TheDZD
44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators 
Field Generator Cleanup, Singularity Fixes,
 2016-08-03 23:29:09 -04:00
Fox McCloud
a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack 
Changes to Player Respawnability
 2016-08-03 19:12:04 -04:00
Fox-McCloud
5533c36af3 Field Generator Cleanup, Singularity Fixes, 2016-08-03 17:17:04 -04:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Crazylemon64
471a5ecca1 First pass at a functioning map writer 2016-08-03 13:26:22 -07:00
Fox-McCloud
0c4e7e48c5 Removs Airlock World Calls 2016-08-02 22:44:27 -04:00
TheDZD
241a41c064 Merge pull request #5285 from Fox-McCloud/cleanup 
Cleans up MakeWizard
 2016-08-02 13:34:58 -04:00
yurivw
21392d29f0 Removed unused options in secrets menu 
Finally, this one should work. Don't use the desktop app kids, only
fucks you over.

Kind of for admins only, but it removes the options for the shuttle in
the secrets menu.

Related issue #5196
 2016-08-02 19:22:50 +02:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Krausus
f325a364d2 Removes /datum/Del and del profiling code 2016-08-02 01:05:03 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Fox-McCloud
a8c61da0d6 Cleans up MakeWizard 2016-08-01 21:58:20 -04:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
Fox-McCloud
2e69b0eec1 Removes More Del's 2016-08-01 21:24:38 -04:00
Crazylemon64
c48d216ebc Fixes negated conditions 2016-08-01 14:25:38 -07:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Crazylemon64
291fac97a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2 2016-07-31 12:41:32 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Krausus
f5b5dc3e91 Merge remote-tracking branch 'refs/remotes/origin/master' into OnceYouLeaveYouCannotComeBack 2016-07-29 14:51:05 -04:00
TheDZD
75a8ac632c Merge pull request #5203 from Krausus/SpookyAdminClicks 
Adds Admin Ghost Click Shortcuts
 2016-07-28 17:09:21 -04:00
TheDZD
407cf4c695 Merge pull request #5206 from Kyep/equip_vox 
Select Equipment: Vox / Greytide / Soviet Edition
 2016-07-28 15:10:37 -04:00
Crazylemon64
cc784f338e Adds bare bones for a persistence system 
Admins can toy around with converting a character to text, and
placing them back elsewhere, independent of the round.

It's got a kink, though: The text given to you directly needs to be
printed once to remove all the escapes - otherwise the thing will choke.
I'd like advice on resolving that
 2016-07-27 13:31:19 -07:00
Kyep
9d9d16a0a0 Admiral Headset 2016-07-27 00:09:12 -07:00
Krausus
dc9591e502 More respawnability changes 
- Respawning as a drone now ignores respawnability again
- Respawning as ERT now ignores respawnability again, but respawnable
ghosts get first dibs
- Becoming a non-respawnable ghost once means all future ghosting will
be be non-respawnable, unless you are sent back to the lobby
- Posibrains now disqualify non-respawnable ghosts, and are more fickle
about pinging
 2016-07-27 02:27:50 -04:00
Kyep
8a5743591c Adds Mime Assassin, Tweaks 
1) Adds Mime Assassin, counterpart to Tunnel Clown
2) Fixes backpack/internalsbox for some outfits
3) Fixes survivor/greytide lack of flashlight
4) Fixes xeno lack of gas mask
5) Fixes soviet soldier double-mateba, excessive c4, but insufficient
ammo
5) Fixes soviet admiral lack of ammo
 2016-07-26 22:10:18 -07:00
TheDZD
7616a33df4 Merge pull request #5162 from Crazylemon64/boom_buildmode 
Adds an explosion buildmode
 2016-07-26 14:13:37 -04:00
Kyep
97446e611a Ensures all loadouts have internals boxes 2016-07-26 04:27:30 -07:00
Kyep
fbfc840cd1 Select Equipment: Vox / Greytide / Soviet Edition 
1) Adds loadouts:
- Vox (also handles Armalis)
- Greytide
- Greytide Leader
- Greytide Fake Xeno
- Syndicate Bomber
- Soviet Tourist
- Soviet Soldier

2) Fixes issues:
- Fixes issue with storage implant in spy loadout
- Dramatically reduces access on most loadouts, making them more usable
without creating OP antags.
 2016-07-26 04:17:02 -07:00
Fox McCloud
863ee10391 Merge pull request #5200 from TheDZD/admin-check-fixes 
Assorted Admin Rights Check Fixes
 2016-07-26 03:38:25 -04:00
Krausus
16500f0f27 Adds admin ghost click shortcuts 
Also refactors extra mob info code into its own proc.
 2016-07-25 23:16:21 -04:00
TheDZD
c7f016a702 Makes CC admin-only jobs check for R_EVENT instead of R_ADMIN, fixes some message spam for mentors that don't have enough access, fixes me fucking up and not checking for rights correctly in the telecomms reset verb. 2016-07-25 19:40:55 -04:00
Crazylemon64
7e76405b11 Adds an explosion buildmode for testing atmos 2016-07-22 12:27:09 -07:00
TheDZD
7fa74a1d1e Re-adds PDA slot 2016-07-21 13:04:02 -04:00
Fox McCloud
2aef88a0f1 Merge pull request #5111 from Kyep/select_equipment_2 
Select Equipment 2: Syndicate Edition
 2016-07-21 10:40:18 -04:00
Kyep
10435bf4c4 Select Equipment 2: Syndicate Edition 2016-07-20 03:11:00 -07:00