cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

252 Commits

Author SHA1 Message Date
Qwertytoforty
e437814945 Update code/game/gamemodes/objective.dm 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2021-10-17 09:32:19 -04:00
Qwertytoforty
29f6773231 Removes uneeded steps, changes from usr to owner 2021-10-15 10:56:18 -04:00
Qwertytoforty
bff6ea69de Update code/game/gamemodes/objective.dm 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-10-15 10:54:19 -04:00
Qwertytoforty
aaabb9515d Makes mindslaves loose their mindslave status when their owner cryos 2021-10-14 19:18:43 -04:00
AffectedArc07
4062bc6b1a Merge branch 'master' into client-data-loading 2021-08-29 20:56:41 +01:00
Qwertytoforty
02ec9714fb Fixes grammer / bugs with supermater sliver and nuke core objectives 2021-08-12 10:52:34 -04:00
AffectedArc07
1fa6186946 Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-08-12 13:24:13 +01:00
AffectedArc07
f73af8b3cf Refactors client data loading 2021-07-29 12:52:45 +01:00
Qwertytoforty
18f3e19051 Apply more suggestions without doing multiline 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:52:43 -04:00
Qwertytoforty
359b3f6aa4 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-05-16 09:19:08 -04:00
hal9000PR
fd27064231 Fixes AI doomsday greentext (#15834) 
* greentext memetext

* TRUE FALSE

* Update code/game/gamemodes/malfunction/Malf_Modules.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-04-04 20:34:38 +01:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Qwertytoforty
3d7ed0df86 ❄️ be gone 2021-03-05 14:26:42 -05:00
Qwertytoforty
88d876d3dc the rest of the fucking owl. Adds nuke core objective, fixes 2021-03-04 13:55:05 -05:00
Qwertytoforty
01321cf5fd More of mochis suggestions 2021-03-04 09:12:15 -05:00
Qwertytoforty
0e789fcf51 Apply suggestions from code review 
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-03-04 08:45:39 -05:00
Qwertytoforty
506f980d3d Adds supermatter sliver steal objective from TG 2021-03-03 16:33:48 -05:00
Fox McCloud
78cb60f160 Fixes Some Sounds Having Reverb (#15602) 
* Fixes Some Sounds Having Reverb

* typeless
 2021-02-24 09:34:34 +00:00
Fox McCloud
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483) 
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
 2021-02-21 21:25:19 +00:00
Fox McCloud
aa86510c54 Turf Refactor, Part 1: Purging /turf/simulated/shuttle (#15454) 
* Turf Refactor, Part 1: Purging /turf/simulated/shuttle

* everything but shuttle templates

* it is done

* titanium airlocks

* correcting multi-turfs
 2021-02-07 11:06:55 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
dearmochi
9f7bd2b560 Optimizes steal objective (#15337) 2021-01-23 22:54:44 +00:00
dearmochi
5edee29a50 [READY] Syndicate Contractors (#14605) 
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
 2020-12-09 12:03:23 -05:00
moxian
5c32bf4c7c Fix typo in objection selection. Stop giving dead people as objectives. 2020-11-09 07:05:12 +00:00
AffectedArc07
e305530d59 Obliterates Zombies 2020-07-02 21:22:55 +01:00
Fox McCloud
e438ff4d36 Makes Mobs Lazier and Removes Hard References (#13693) 
* Makes Mobs Lazier and Removes Hard References

* fluff
 2020-06-30 17:52:28 -06:00
joep van der velden
8e2b69f5db Fixes the steal objective from runtiming 2020-06-06 09:55:00 +02:00
joep van der velden
8b2e843c8a Changes the absorb objectives text 2020-05-29 23:02:28 +02:00
SteelSlayer
2d594922ae Makes all types of silicon mobs get ignored for the AI's hijack objective 
issilicon
 2020-04-13 16:20:59 -05:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152) 
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
 2020-03-20 21:56:37 -06:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
SteelSlayer
15694dad68 List SSD and AFK panel fix (#12600) 2019-11-09 22:32:54 -05:00
Mark van Alphen
6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloud
3eb4ad0ed5 Maintainers Have No Sense of Right or Wrong (#12381) 2019-09-24 15:15:05 -07:00
Dave
2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayer
94bb14bb29 Datumizes traitors and mindslaves (#11969) 2019-09-21 16:50:03 -07:00
Coul
6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
datlo
a408aea8f4 fix conflicting objs and double exchange docs 2019-08-08 10:30:05 +02:00
Couls
6ee8c0d96f Merge remote-tracking branch 'upstream/master' into zombies 2019-08-04 21:05:10 -04:00
variableundefined
87f483c9f6 Merge pull request #11581 from alex-gh/location_hint_fix 
Steal objective and Adv Pinpointer no longer target items in Centcom Z level.
 2019-06-28 21:04:01 +08:00
Mark van Alphen
a2a95383a8 Add some extra offstation checks 2019-06-02 03:24:38 +02:00
alex-gh
f9bdf3ab6c Theft objective locations hints now ignore the Centcomm Z level. 2019-05-23 12:10:37 +02:00
Couls
883594178b Objective handling, Species now properly saved, new zombie language only fellow zombies can understand 2019-05-17 14:43:24 -04:00
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01: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
datlo
24ef06d249 Allow hijackers to take hostages 2019-02-25 14:29:58 +00: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
Kyep
ede5217093 switch to is_level_reachable 2019-01-26 17:23:20 -08:00
Kyep
ad6c866f8f Stops objectives targeting admin centcom characters 2019-01-26 17:15:23 -08:00