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

441 Commits

Author SHA1 Message Date
Fox McCloud
ca6f253aa6 Merge pull request #16449 from AffectedArc07/client-data-loading 
Refactors client data loading
 2021-09-20 15:16:55 -04:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
AffectedArc07
1fa6186946 Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-08-12 13:24:13 +01:00
variableundefined
99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh 
Adds supermatter sliver steal and plutonium core steal objective from TG
 2021-08-11 16:05:24 -04:00
AffectedArc07
f73af8b3cf Refactors client data loading 2021-07-29 12:52:45 +01:00
Qwertytoforty
eeb8f7054c Order tweaks, removal of duplicate 2021-07-23 14:36:18 -04:00
Qwertytoforty
5326447264 Apply final suggestions 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:54:24 -04: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
addb4d8170 Apply this suggestion that is picky 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:46:36 -04:00
Qwertytoforty
e5c40bd07e First third of suggestions 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:43:11 -04:00
Qwertytoforty
6f6d04f8f7 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-07-23 10:35:54 -04:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
SabreML
b9a4929235 'Fit Viewport' & Scoreboard refactor (#16294) 
* Fit Viewport V1

* Scoreboard

* Moderate scoreboard refactor

Mostly just removing the global variables, since Mochi has plans for a proper big scoreboard refactor in the future.
 2021-07-09 11:18:05 +01:00
Qwertytoforty
e4461eac09 Please don't break 2021-06-28 19:12:39 -04:00
SabreML
c266b27aed Another small bugfix bundle (#16260) 
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-26 22:57:27 +01:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
Qwertytoforty
9e28cc0afe Enforces nukies to wait at least 10 minutes after war before heading to station (#16115) 2021-06-17 10:32:59 +01:00
AffectedArc07
efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
Ryal
e8be0bd869 Makes all nuclear operatives remember the nuke code (#15978) 
* Makes all nukies remember the nuke code

* var argument fix and formatting tweaks

* Apply suggestions from code review

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-06-05 09:14:46 +01:00
AffectedArc07
f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
Deniz
5a12564b72 fixes "destoyed" to "destroyed" (#16121) 
The station was destoyed by the nuclear blast to
The station was destroyed by the nuclear blast
 2021-06-01 13:24:52 +01:00
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
AffectedArc07
8dd5dfbf7f URL configuration 2021-05-16 21:14:10 +01:00
Qwertytoforty
134a2ddba5 Re adds the stuff I removed accidently 2021-05-16 09:42:08 -04:00
SabreML
d2181a89bf Adds wiki links to antag greeting messages (#15939) 
* Wiki Links Pass 1

* Wiki Links Pass 2

Ash Walkers,
Terror Spider spawns,
Terror Spider event,
Construct transfer,
Xenomorphs

* Less hardcoding
 2021-05-16 11:36:26 +01:00
hal9000PR
2c63bd9581 Fixes a couple bugs with nukes (#16008) 
* fixes, code cleanup

* legiiiiiiiiit jade review

Co-authored-by: dearmochi <shenesis@gmail.com>

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-05-16 09:37:56 +01:00
Ryal
20dd49a284 Deploys the nuke by default (#15793) 
* Deploys the nuke by default

* Update code/game/gamemodes/nuclear/nuclearbomb.dm

Co-authored-by: dearmochi <shenesis@gmail.com>

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-04-06 13:59:37 +01:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00: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
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357) 
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
 2021-02-03 20:52:03 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371) 
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
 2021-01-28 20:57:37 +00:00
AffectedArc07
28ca87ef31 Delta Standardisation 2021-01-25 13:06:08 +00:00
SabreML
c795b9a5f0 Declaration Fix (#15321) 2021-01-21 20:58:15 +00:00
Kyep
4b8d94d807 more pinpointer runtime fixes (#15305) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-01-18 21:36:07 +00:00
AffectedArc07
2f6b0a9a0f world/Reboot refactor (#15268) 
* world/Reboot refactor

* Re adds noises

* Im being punished by my own CI!
 2021-01-15 13:03:08 -05:00
Qwertytoforty
d5734b87ec Adds a slight warning that you may have screwed up to the nuclear bomb (#15232) 
* Adds a slight warning that you may have screwed up

* Update code/game/gamemodes/nuclear/nuclearbomb.dm

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
 2021-01-07 11:19:24 +00:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132) 
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
 2020-12-24 16:06:48 -05:00
Kyep
3f6b7de694 Pinpointer runtime fixes (#15162) 
* Fixes pinpointer.dm runtimes

* more pinpointer stuff

* fixes a crew.dm:37 runtime as well

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-12-21 09:47:37 +00:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
Qwertytoforty
cebc4b50ef Pinpointers can now point to their respective nuke. (#14783) 
* Allows crew and operative nuclear pinpointers to point to their respective nukes

* Maybe hit a few more of them

* Removes true/false from active, fix henk question.

* SSSPEEEEEEEEEEEDprocess

* Steels requests

* Mode is 2 in some cases(thanks adv pinpointer), steels request

* REFACTORS PINPOINTERS AGAIN and henks stuff

* Fixes travis + runtimes

* Update code/game/gamemodes/nuclear/pinpointer.dm

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

* Henks requests

* Switches things up

* Apply suggestions from code review

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

* Fixes it, adds desc as per affecteds request

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-11-18 20:26:37 +00:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
Kyep
222d17c01f fixes merge conflict 2020-09-15 08:56:35 -07:00
SteelSlayer
2a70626c78 affected review tweaks 2020-09-14 11:38:17 -05:00
Kyep
c7d869c46d var/nukecode = rand(10000, 99999) 2020-08-31 11:00:23 -07:00
Kyep
091b3c9462 AA requests 2020-08-31 08:10:54 -07:00
Kyep
ad5f64bd8c [TGUI] Nuclear Bomb 2020-08-31 07:29:40 -07:00
SteelSlayer
609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
Kyep
dbbb226a27 fix offstation_role bug 2020-08-08 06:24:29 -07:00