cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 16:12:24 +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
AffectedArc07
6675cac09b Map compile pass 1 2021-10-02 13:39:20 +01:00
AffectedArc07
b0e9db64bd Revert "Merge pull request #16520 from SabreML/fix-bundle-4" 
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
 2021-09-07 16:16:40 +01:00
variableundefined
9a62622fbc Merge pull request #16520 from SabreML/fix-bundle-4 
Fix bundle #4
 2021-09-06 22:29:10 -05:00
SabreML
6e872bed69 Map edit on a space ruin 
This REALLY needs refactoring
 2021-08-26 15:10:16 +01:00
S34NW
ce52b4d15c of COURSE it was varedited somewhere 2021-08-21 17:43:25 +01:00
Farie82
64930de41c Makes all toy figurines tiny and refactors the code behind it (#15368) 
* Makes toy figures tiny and refactors the code behind it

* Apply suggestions from code review

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

* atom_say and capitalize names

* Web edit baby

* Merge conflict fixes

* Init instead of New

* prize_ball instead of mechball

* prize_ball should not be a figure. Revert but keep the Init change

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-07-15 13:59:26 +01:00
SabreML
036a69fea4 Removes pixel_* = 0 and tag = "icon*" from the map files (#15438) 
* Pixel Removal

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Fix

Why is that even there?

* Fix

Apparently I did the regex stuff in the wrong order for `Lavaland.dm`. Whoops

* Unit tests

* Mother of all map edits

* `tag = "icon` purging

* No area check

Far too much code debt for this PR to cover, but soon...

* At request

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-14 23:07:12 +01:00
Pyrodes
9d3800b49e Added an arcade machine to the syndie space base (#16240) 
* Added an arcade machine to the syndie space base

* Added an arcade machine to the syndie space base

* Moved location of the arcade in syndiespacebase
 2021-07-09 21:36:29 +01:00
Fox McCloud
f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code 
Removes some oldcode
 2021-07-07 09:57:16 -04:00
theo-3
5f4df80909 Add blast doors and a camera to the syndicate base test chamber (#16261) 
* Add blast doors and a camera to the syndicate base test chamber

* Replace floating camera with two cameras
 2021-06-29 11:34:05 +01:00
Matt
f11a934ded Change all off-station power terminals to /monitor/secret (#16245) 2021-06-24 12:13:12 +01:00
AffectedArc07
3f1a6bcd35 This too 2021-06-19 19:02:37 +01:00
AffectedArc07
354bf846ab No more goth tiles 2021-04-20 18:43:44 +01:00
SabreML
0eaec89adb Soup Drinking (and custom soups!) (#15620) 
* SOUP

* Space stuff

it compiled before I swear

* =
 2021-04-15 22:04:24 +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
Dsdiy
7bfc68afa6 Updating Clown Ruin and nerfing Staff of slipping. (#15362) 
* Updating Clown Ruin and nerfing Staff of slipping.

I noticed how the staff of slipping was commonly used by antags as an infinite stun that also affected borgs. So, I replaced the one that spawns on lavaland with one that only has 5 charges.

* Updates as requested

Changed to wand of slipping to avoid confusion with staff

* Old nerfed Staff removal

Quickly removes old nerfed staff

* fixes errors

should compile in DM now

* requested changes

Changes as requested by Arc
 2021-02-21 21:30:28 +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
Fox McCloud
b3b11a81c5 LINDA Performance Refactor (#15384) 
* LINDA Performance Refactor

* forget about this

* very important refactor content
 2021-02-06 21:50:11 +00:00
Fox McCloud
228ae8ff64 Purging Will Continue Until Simulations Improve (#15436) 2021-02-04 16:53:17 +00:00
Fox McCloud
6074323192 Further Updates Windows (#15427) 
* Further Updates Windows

* correction
 2021-02-03 10:04:52 +00:00
AffectedArc07
62b618dcd4 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2021-01-28 21:35:44 +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
Fox McCloud
3c4424e9da Removes Malf AI Module from Ashwalker Nest (#15319) 2021-01-24 13:35:30 +00:00
AffectedArc07
b797f85a49 Fixes bad area pathing on all the lava ruins (#15108) 2020-12-16 14:41:15 -05:00
ExusA
8837621dfb redo redo again (#14829) 2020-11-06 13:37:22 -05:00
AffectedArc07
3f75b836b0 Removes /obj/machinery/microwave (#14718) 2020-10-24 21:27:33 -04:00
TDSSS
63e3c3b973 renaming ussp port 2020-10-10 14:50:44 +02:00
TDSSS
6039179d6a Makes golem shuttle always usable 2020-10-10 01:36:10 +02:00
variableundefined
f05bcd8b41 Merge pull request #14309 from TDSSS/depot-fix 
Fixes #14302
 2020-09-15 14:53:09 -04:00
variableundefined
701972fc67 Merge pull request #13914 from Kyep/winter_dome_remove_cap_laser 
Updates to lavaland winter biodome
 2020-09-15 14:52:18 -04:00
TDSSS
e3a8e5931c fix 2020-09-15 12:00:30 +02:00
AffectedArc07
47aeac7954 Merge pull request #14149 from Nazsgull/extraSpessRuins 
Adds extra spess ruins
 2020-09-06 11:07:09 +01:00
AffectedArc07
9b7ed430b3 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2020-08-30 08:46:30 +01:00
awdaw
b8f0bb3b6e Update syndiecakesfactory.dmm 
Minor tweaks, updated the integrity of a door so the corgi does not kill his friends and changed his description a bit
 2020-08-30 06:36:00 +02:00
awdaw
5b85042a48 Update syndiecakesfactory.dmm 
Removes duplicate EVA related items
 2020-08-30 02:11:33 +02:00
awdaw
6296983d25 Balances loot 
Bananium sheets x50 -> x5
Bluespace crystal x10 -> x3
Telekinesis DNA injector > Clowntalk DNA injector
 2020-08-30 01:58:43 +02:00
awdaw
5209c64cfe Removes the maze and variations from maps and space.dmm 
Might come back in other PR as away missions but for now they need a revision...
 2020-08-30 01:47:17 +02:00
awdaw
3ca85da8d7 Adds " to paper because it's a string type and needs it 2020-08-30 01:39:27 +02:00
Kyep
703b68db34 squash 2020-08-28 09:04:00 -07:00
Kyep
74b055368b fixes listening outpost by adding relay 2020-08-28 08:53:42 -07:00
awdaw
53e00a5573 Mapmerge, dmm2tgm and such 2020-08-26 23:27:06 +02:00
awdaw
3b7c300d8e Adjusts lights again 2020-08-26 23:24:24 +02:00
awdaw
73cb28e5ff Ran mapmerge.bat and dmm2tgm.bat on all mazes 2020-08-26 23:16:14 +02:00
awdaw
53a8ece0aa Update syndiecakesfactory.dmm 
-Removes sneaky switch that had a corgiGibber var.
-Updates power cable layout so the plasma generator really powers the SME when on.
 2020-08-26 23:14:30 +02:00
awdaw
15c3b7c67d Ran tools/mapmerge2/dmm2tgm.bat on debris1, 2 and 3 2020-08-26 22:41:18 +02:00
awdaw
98f64e735b More corgiGibber variables removal 2020-08-26 20:05:52 +02:00
awdaw
ed08aeda59 Removes corgiGiver from every conveyor 
Hopefully this will allow Travis build to pass
 2020-08-26 19:24:47 +02:00
awdaw
2691509311 applies mapmerge.bat to syndicakes.dmm 2020-08-26 19:04:37 +02:00
awdaw
07644351c9 Removes variable that caused the build to fail (again) 2020-08-26 15:03:03 +02:00
awdaw
ae2f07a759 Removes variable that made the build fail 2020-08-26 14:48:34 +02:00