cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,827 Commits 26 Branches 2 Tags
f029dd1dfcbb58da2e27e3c8f321be9bbe2b92fd
Commit Graph

865 Commits

Author SHA1 Message Date
Nazsgull
1123476af6 Nerfs Lava Staff (#13971) 
* Nerfs Lava Staff so it cannot be used outside mining z level

Added  a timer and a spark system to spawn sparks when lava staff malfuntions.

Lava staff will check what z level is his user on, and if it's not mining will only spawn a few sparks.

* Updates description

Old description made little sense as lava staff will no longer work at the emergency shuttle.

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm

Adds spaces between method call parameters.

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

* Removes unused spark effect system

Since I'm using do_spark() I don t really need a whole spark system.

* Gets rid of "timerMalfuntion" var

Instead of using 2 variables to do the same, "timer" will now control the cooldown for when the staff works and for when it malfunctions.

* Removes unnecesary time check

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mining/lavaland/loot/ashdragon_loot.dm as suggested by @farie82

Co-authored-by: farie82 <joepvelden@hotmail.com>

Co-authored-by: awdaw <uo251631@uniovi.es>
Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
Co-authored-by: farie82 <joepvelden@hotmail.com>
 2020-12-16 15:28:11 -05:00
Edan52
fdc3a9fe2e Makes Bubblegum fightable (#13202) 
* nerf

* remove other loot
 2020-12-16 14:55:15 -05: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
dearmochi
0e15d69971 [TGUI] Ore Redemption Machine (#15016) 
* [TGUI] Ore Redemption Machine

* small thing
 2020-12-05 11:04:46 +00:00
Oyu-De
5816aa3dc3 Gets rid of <br> on science request console (#15029) 
* Fixes <br> not being rendered properly

<br> on request console was just showing up as <br> so changed it with \n thanks to help I got on discord. it is still horrible, but less horrible.

* Update machine_redemption.dm
 2020-12-01 13:44:49 +00:00
dearmochi
b69c4754b7 Fix AIs ejecting IDs in Mining Vendors to their core (#15018) 2020-11-30 08:48:09 +00:00
AffectedArc07
4996ac3373 Merge remote-tracking branch 'ParadiseSS13/master' into nanoui-is-dead 2020-11-27 10:21:41 +00:00
Kyep
4a944658ad [TGUI] Upgrades Bots (#14871) 
* secbots, ED209s, cleanbots

* Apply suggestions from AA code review

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

* fluid buttons, Restore Safties

* pai rebuild

* deletes all spacing from data list

* katana needs_permit

* lava/storm/boneaxe needs_permit

* check s_store

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2020-11-27 09:56:02 +00:00
AffectedArc07
44012814d0 Merge branch 'master' into nanoui-is-dead 2020-11-26 09:34:14 +00:00
dearmochi
41d6fd9630 Fix marker beacon duplication exploit (#14973) 2020-11-23 12:23:03 +00:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
AffectedArc07
984ac231e0 Nano Is Dead 2020-11-21 09:46:50 +00:00
AffectedArc07
2c37ae8fd0 The road to Initialize() stability - Enforcing parent call on New(), Initialize() and Destroy() (#14719) 
* The road to Initialize() stability

* Fixes sanity, for now
 2020-10-28 12:35:36 -04:00
Varghh
7a1326664d Labor Camp (Gulag) Rework (#14707) 
* remap, machines and a lot

* Update cyberiad.dmm
 2020-10-26 18:25:06 -04:00
AffectedArc07
9e8932afac Centralised persistent data management framework (#14169) 
* Centralised persistent data management framework

* register() proc

* Deletes lavaland black box
 2020-10-26 17:54:15 -04:00
joep van der velden
b5b70de391 Can't claim points when no ID is inserted 2020-10-18 16:26:10 +02:00
joep van der velden
9ef602bb1b TGUI labor claim console. Fix fifty stack dupes 2020-10-18 16:18:38 +02:00
Kyep
320f1d60c1 sentient minebots can no longer be converted to cult (#14547) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-10-14 20:48:56 -04:00
AffectedArc07
5f98b98360 Merge pull request #14572 from TDSSS/xeno-exploit-fix 
No more DIY xeno outbreaks
 2020-10-11 10:05:52 +01:00
TDSSS
607d65b99e slightly different tabbing 2020-10-10 00:28:39 +02:00
TDSSS
4a5ef88fb5 No more DIY xeno outbreaks 2020-10-10 00:24:14 +02:00
AffectedArc07
ae5a3470a5 Merge pull request #14009 from Kyep/remove_mining_access_card 
Alters mining conscription kits to remove the mining access card
 2020-10-04 18:39:36 +01:00
AffectedArc07
48564e3b20 Merge pull request #13998 from Kyep/megafauna_jaunter 
Wormhole Jaunters can no longer teleport megafauna to station, unless emagged
 2020-10-04 18:38:47 +01:00
Fox McCloud
ec00ce9c6c Merge pull request #14092 from farie82/revert-14037-lag_wont_drag_on 
Revert "Disables dragon transformation because its users can freeze the whole server"
 2020-10-04 04:10:30 -04:00
AffectedArc07
414cef224d Merge pull request #14515 from farie82/tgui_close_uis_fix 
Makes gibtonite check if it has wires before closing TGUI windows
 2020-10-02 20:31:55 +01:00
joep van der velden
7ac9bf46c2 Makes gibtonite check if it has wires before closing TGUI windows 2020-10-02 20:54:43 +02:00
SabreML
c57d25b1cf Quick fix fix 2020-09-26 13:16:50 +01:00
SabreML
bdbb7e3fbc Quick fix 2020-09-26 12:53:53 +01:00
farie82
81682dc626 Adds muzzle flashes for guns depending on the ammo (#13322) 
* Muzzle flashes added for guns

* Use an muzzle flash effect now.

* Unused var

* sillenced guns have a lower alpha muzzleflash effect
 2020-09-20 12:41:45 -04:00
Kyep
df97c245e7 fixes merge conflict 2020-09-18 04:00:22 -07:00
Kugamo
55fcdbc503 Adds PDA lamps and in-PDA ID sprites (#14032) 
* Adds sprite for PDAlight, references it, and alters PDA sprites to add off bulbs & redoes all the ID-in-pda sprites, and reorganizes the dmi.
 2020-09-16 10:38:49 -04:00
AffectedArc07
bc3c5258a0 Merge remote-tracking branch 'ParadiseSS13/master' into pr/TDSSS/14065 2020-09-15 17:33:08 +01:00
Kyep
fc6d0e06e9 fixes merge conflict 2020-09-15 08:30:26 -07:00
mochi
5459e515ad Merge branch 'master' into mining-vendor-refactor 2020-09-14 20:50:42 +02:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor 
TG Flying+Floating Refactor
 2020-08-27 20:08:35 +01:00
farie82
64b76f6ffc Revert "Disables dragon transformation because its users can freeze the whole server" 2020-08-16 14:18:56 +02:00
SteelSlayer
609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
TDSSS
069512e38a removes unreachable code 2020-08-12 00:16:57 +02:00
TDSSS
5869155477 update branch 2020-08-12 00:00:02 +02:00
TDSSS
f18f34eb2d It works! 2020-08-11 23:54:39 +02:00
TDSSS
cfe665842e WIP 2020-08-11 20:32:19 +02:00
Kyep
4bcbb65b37 disables dragon transformation because it freezes the server 2020-08-08 07:43:35 -07:00
Kyep
edabe8a846 Removes mining_access_card 2020-08-04 11:19:58 -07:00
Kyep
6277978bd6 Jaunters can no longer teleport megafauna, unless emagged 2020-08-03 00:08:48 -07:00
SteelSlayer
06686a302a Adds a bunch of SStgui.close_uis(wires) 2020-08-01 14:40:06 -05:00
AffectedArc07
debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
farie82
cdc762975c Makes for loops use GLOB.human_list. Should improve performance a bit. Fixes blood contract affecting dead crew (#13691) 
* Replaces all human in X to GLOB.human_list

* crew monitor

* no playerlist converts

* forgot to stage there...
 2020-07-21 16:43:24 -04:00
farie82
9111a64af9 Meat hook fix. Beam runtime fix (#13867) 2020-07-21 03:33:23 -06:00
AffectedArc07
bd27e9f897 Removes MORE hardcoded zlevel numbers (#13882) 2020-07-21 03:29:56 -06:00