cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,784 Commits 26 Branches 2 Tags
c13535c2d00dcdcec2f9d2ce99da8ebe55efeb96
Commit Graph

1371 Commits

Author SHA1 Message Date
AffectedArc07
3961ede300 Fixed R&D console bluescreen bug (#17753) 2022-05-08 23:52:31 +01:00
S34N
240c738e2b Gamma armoury balance (#17495) 
* cc fixes, gamma armoury changes

* reverts the fixes

* how did these change, who knows, here's a revert anyway

* merge master

* what the hell am i doing, i dont know

* fixes weird lathe stuff
 2022-05-03 04:38:34 +01:00
Qwertytoforty
2aade6012f Completely reworks the plasma pistol, adds the dropwall shield generator (Serious) (#17556) 
* oi you got a loicnse for that

* Final touches on plasma bar sound/sprite, hot drops hot drop walls

* Actually makes dropwalls good™️

* s p r i t e s and fixes

* Gives vox / drask hand gun sprites

* forgot cult shield, ICONS added with pain

* Last minute fixes and deploy coder sprites

* spacing

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

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Removes comments, improves deployment and sprite handling

* Removes direction_check

* Uses signals, various changes

* Final™️ changes

* Final™️ Final™️ Changes

* Final™️ Final™️ Final™️ Changes

* [insert final™️ x4 joke here]

* Final™️ Change. *6

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-04-30 15:52:25 +01:00
Kugamo
7189ae5d65 Janitor QOL (#17594) 
* Yes

* No

suggested changes

* Maybe

Suggestions + water in cart sprites

* Merge Conflict Resolve

* Suggested Changes :o)

* fixes bugs

* suggested changes round 2
 2022-04-22 11:39:21 +01:00
Vi3trice
620a8d49a4 Fix Experimentor deconstruction, and standardizes into tool procs (#17593) 
* Update experimentor.dm

* Should have been sane

* Forgot that
 2022-04-12 15:52:01 +01:00
S34N
4fd261485d removes upgrade for removed secborg module (#17512) 2022-03-24 22:45:24 +00:00
S34N
db98ce3adb Removes mech mass drivers and associated code (#17473) 2022-03-15 11:38:42 +01:00
Qwertytoforty
57eb272399 Remove duplicate tracking implants (#17365) 2022-01-24 14:32:55 +01:00
S34N
e23ee29fad Removes "name" design datums. Adds logging for null design error. (#17165) 2021-12-06 07:53:05 +01:00
Adrer
c5149314e1 Removes mention of mechanic in RND Robotics server (#17157) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-11-25 09:48:17 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
matttheficus
58d3c21ea8 goodbye you annoying spam (#16970) 2021-10-23 10:49:20 +01:00
PacifistDalek
f2b2aac1bf Update comp_board_designs.dm (#16901) 2021-10-09 17:18:00 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
botka4aet
a829573010 Update xenobio_camera.dm 2021-09-24 15:34:09 +03:00
Fox McCloud
a081051133 Nerfs Shotguns 2021-09-08 12:17:08 -04:00
variableundefined
841ad0f1fd Merge pull request #16609 from SabreML/GC-fixes-1 
GC fix bundle #1
 2021-09-06 22:15:44 -05:00
SabreML
e9f807fa3b More reviews 
The bat faction needs to use \ref, since the faction check system uses that too.
 2021-09-02 21:05:18 +01:00
SabreML
0a4b398b06 Review 2-3 2021-08-29 00:59:39 +01:00
SabreML
85eb273b4f Review 1 2021-08-28 21:57:16 +01:00
SabreML
83724d4702 RnD Machinery 2021-08-28 21:06:47 +01:00
SabreML
06ec133374 Message Monitor 2021-08-28 21:05:59 +01:00
E-MonaRhg
101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
SabreML
02fe0876f5 Fix bundle #3 (#16411) 
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-05 11:04:27 +01:00
E-MonaRhg
4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
Qwertytoforty
c65a472888 Adds the BSG to RND designs (#16328) 
* Adds the BSG to RND designs

* Update code/modules/research/designs/weapon_designs.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-07-26 18:12:37 +01:00
variableundefined
d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config 
[READY] Converts configs to use TOML + Configuration refactor
 2021-07-25 08:26:29 -04:00
SabreML
150e7e3f60 Painter Item Refactor (#15828) 
* Modular Painter V1

* Improved Suicide

* Type & Text

Also `item_state` just goes from `icon_state` so it's not needed.

* Modular Painter V2

Big refactor of everything to use datums rather than separate objects.

* Steel airlock stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Vile Heresy

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
 2021-07-20 15:25:45 +01:00
E-MonaRhg
f83b8ae14e Suggested stuff 2021-07-09 19:44:02 +02:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
Kepplerx
1d04a9ec74 AI Detector can now only detect AI, not Abductors, Xenobio consoles or Shuttles (#15535) 
* Update navigation_computer.dm

* V7

* Update navigation_computer.dm

* All instances

* Added explainers

Seems this is done some places, seems nice and easier to understand with em

* Updated name

* Change Variable name

Changed as per advise of Fox
 2021-07-08 23:18:15 +01:00
E-MonaRhg
c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02: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
AffectedArc07
efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
S34N
b890db5cb9 fixes runtime in destructive analyzer (#16129) 2021-06-04 20:44:07 +01:00
AffectedArc07
f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
SabreML
40458173e2 I can't think of a commit name (#16104) 2021-05-28 16:53:22 +01:00
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
AffectedArc07
d68480b8b4 Movement configuration 2021-05-17 17:47:34 +01:00
E-MonaRhg
09c13f7706 More grammar and flavor stuff that I certainly did not forget about 2021-04-06 02:50:58 +02:00
E-MonaRhg
7b342f4476 Hey, that compact defib thing is pretty cool, what if we had three? 2021-03-31 22:34:17 +02:00
Adrer
53399ff87f Make RND machines check for upgraded parts when checking if an item is constructable (#15753) 
* Protolathe design buildability check efficiency

* Efficiency_coeff rounding error fix

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-03-31 19:46:15 +01:00
Kyep
46144e3c07 Syndie Space Base (#15104) 
* v1

* v2, floors

* more tweaks

* areas, powernet

* cleanup

* changed filename, added east wing, 6 slots

* syndi autolathe

* update ruins refs & config, delete comms agent

* IDs look properly syndie, names are randomized

* glass

* convert map file to TG map format

* del old file

* air alarms

* del navconsole, fix area tile

* AA request

* refactor

* AA requests II

* dorms symmetry

* deletes explosive plastitanium walls & self destruct device (from lavabase)

* add light to medical operating table

* atmos refill connectors

* add air canister and move meter in distro, add 2 portable air pumps

* improved vents

* tweaks pipes

* removes duplicate air alarm

* (PR req) replace areas/lathe/spawners with PR versions

* wrench, tele area icon, headset name

* player panel fix, replace /anyone ID with /researcher ID, ID.untrackable refactor

* fixes teleporter runtime

* "Syndicate Researcher" consistency

* cryo room

* delete syndiwrath

* default job on ID card for telecomms purposes

* add vents and airlocks

* air alarms toggle firelocks

* artvend

* trashbags

* revert alarm.dm

* delete rogue light

* update syndi lathe name, remove newscaster frame

* changes made necessary by atmos/redcross PRs

* fixes merge conflict

* update to fix conflicts with PR 15384 as well

* syndi teleporter now requires SYNDI_LEADER access, no more runtimes

* avoids making offstation cryopods always face right

* add scrubber net

* dmm2tgm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-03-30 18:54:19 +01:00
Fox McCloud
4e13913d39 TG Sprite Project: R&D, Mechfabs, Telecomms, and Station Objects (#15681) 
* TG Sprite Project: R&D, Mechfabs, Telecomms, and Station Objects

* tweaks

* other sprite
 2021-03-30 12:11:39 +01:00
Qwertytoforty
2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343) 
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

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

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-03-30 11:55:31 +01:00
Kepplerx
0b74b9e31f Update mechfabricator_designs.dm (#15515) 2021-03-28 12:39:36 +01:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519) 
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
 2021-03-03 20:21:30 +00:00
Fox McCloud
dcace52184 Makes the Clown All Powerful (#15612) 
* Makes the Clown All Powerful

* sadtrombone.ogg
 2021-03-02 16:16:47 +00:00