cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

604 Commits

Author SHA1 Message Date
Fox-McCloud
6bea9ac085 Merge remote-tracking branch 'upstream/master' into medical-stacks 2016-07-22 09:40:40 -04:00
FreeStylaLT
df1b2ddf71 fixes cobwebs, basketball, re-adds lockers to armory 2016-07-22 13:41:46 +03:00
Fox-McCloud
a4e7a41426 Refactors Medical Stacks 2016-07-21 12:26:21 -04:00
FreeStylaLT
df6710bddf fixes conflict 2016-07-21 18:41:13 +03:00
Fox McCloud
25b1cf91b5 Merge pull request #4881 from TullyBurnalot/DetectiveRequest 
Surgery Quality-of-Life Remap
 2016-07-21 10:28:50 -04:00
TheDZD
6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued 
More Reagent Refactoring and Cleanup
 2016-07-21 10:12:14 -04:00
FreeStylaLT
9094f81428 Brig Bugfix PR 2016-07-21 13:31:35 +03:00
Fox-McCloud
b49e6c5b5a ACTUALLY FIXES MINING APC 2016-07-21 02:50:07 -04:00
Fox-McCloud
b780193d9b Fixes Outpost APC 2016-07-20 21:05:25 -04:00
TullyBurnalot
d8fc0bb051 Fixes merge conflict 2016-07-20 04:02:21 +01:00
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -04:00
Kyep
1914bae84a Remaps Perma (#4747) 
* Remaps Perma

- Added: botany, basketball court, food, public library machine,
individual cells
- Removed: south-facing windows, unused treadmill, pointless laundry
area

* Update 2

- Adds mirror
- Removes space law book & table
- Moves chessboard down one tile

* New layout

* Minor Tweaks

* Deletes some cables

* Added stuff jutting out into space, roughs up the edges a bit

* Tweaks

* Shrunk size a bit

* Tiger, Tiger, bringing lub

In the forests, of the github
 2016-07-18 19:51:51 -04:00
Fox-McCloud
7bdf89e37c Merge remote-tracking branch 'upstream/master' into sleeper-changes 2016-07-17 01:34:43 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks 
Various Mining Tweaks
 2016-07-16 10:57:54 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun 
Plastic Explosives Update
 2016-07-16 04:07:12 -04:00
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -04:00
Fox-McCloud
e6c02e3a2c Merge remote-tracking branch 'upstream/master' into mining-tweaks 2016-07-15 23:16:00 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins 
Crazypilot's Space Ruins Port
 2016-07-15 22:55:51 -04:00
Fox McCloud
aa2ff8ceea Merge pull request #4843 from FreeStylaLT/youpieceoffuckingshitforgottousemapmerger 
Good heavens look at the time it's SEC REMAP O' CLOCK
 2016-07-15 22:32:28 -04:00
Fox-McCloud
0fb2bfd8f1 Various Mining Tweaks 2016-07-14 22:07:04 -04:00
FreeStylaLT
f9fb6ebc21 and this little pipey went to atmos, and this little pipey went home, and this little pipey got molded into a manifold 2016-07-14 14:48:44 +03:00
FreeStylaLT
218b29c64e yes this is ready 2016-07-14 08:10:42 +03:00
Fox McCloud
a8978be957 Merge pull request #5010 from Ar3nn/what 
What
 2016-07-13 23:25:56 -04:00
SamCroswell
cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
TheDZD
bb71be600c Merge pull request #5006 from Fox-McCloud/fans 
Fantastic PR
 2016-07-13 21:48:10 -04:00
FreeStylaLT
502e080117 fixes magical disappearing locker ffs 2016-07-13 19:24:01 +03:00
Ar3nn
d0744b81ed Deletes extraneous lattices near Security 2016-07-12 23:02:28 -04:00
Fox-McCloud
3acce26982 Fantastic PR 2016-07-12 18:21:02 -04:00
FreeStylaLT
1f24d9503a fixed camera issues 2016-07-12 14:43:32 +03:00
FreeStylaLT
e2cfb91b84 fixed cabling, unwalled clown's office 2016-07-12 11:13:40 +03:00
FreeStylaLT
e033a0109f ..and fixes AI blind spots and floating camera 2016-07-12 03:22:09 +03:00
Tigercat2000
15de192719 Metastation Fixes v5555555 
- Fixes a few missing pipes
 - Fixes the grav gen being horrifyingly mangled
 - Fixes runtimes on start because of decorative shuttle consoles
 2016-07-11 15:41:33 -07:00
FreeStylaLT
7720a58785 fixes a bunch of bugs, too many to list, fixes tile patterns 2016-07-11 19:42:47 +03:00
FreeStylaLT
b9b70b3d82 re^6-mapped conference/locker rooms, added door to secondary armory, removed biohazard and bomb disposal lockers 2016-07-08 19:10:30 +03:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 
All hail glorious leader tigercat
 2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the 
map loader to safely load templates mid-run
 2016-07-07 23:52:44 -07:00
FreeStylaLT
0e19863a60 fixed massive area bugs caused by merge conflict, tweaked courtroom, added pepper spray refiller to brig physician's office 2016-07-06 16:38:28 +03:00
FreeStylaLT
5c850b7419 fixed map merge conflict also will strangle tully over his pepper fuckery 2016-07-06 14:06:26 +03:00
TullyBurnalot
c5928ddfde Fixes Merge Conflicts 
I hope.

Please.

PLEASE.
 2016-07-06 04:14:35 +01:00
Fox McCloud
0487485932 Merge pull request #4860 from FreeStylaLT/geneticswindowsandsciencecopier 
Minor fixes/QoL changes request PR, also genetics windows
 2016-07-05 19:08:52 -04:00
FreeStylaLT
3ec176af34 added one more window, shuffled pen back to original state 2016-07-06 01:13:54 +03:00
TullyBurnalot
3e44c3cec8 Edit 4 
- Turned tables into Glass Tables
 2016-07-05 19:58:36 +01:00
TullyBurnalot
1e6e6ba159 Edit 3 
- Removed OR Pajama Wardrobes
- Added 6 Pajama Wardrobes in the OR Foyer
- Moved the beds in the OR Foyer
- Moved the Disposals Chute inside the ORs
- Modified piping system to be symmetrical
 2016-07-05 14:15:48 +01:00
TullyBurnalot
7051352eb9 Edit 2! 2016-07-05 12:56:30 +01:00
TullyBurnalot
b82d6be644 Surgery Quality-of-Life Remap 
Simple additions, really:

- Removed Personal Lockers from OR Foyer (never used)
- Added one Pajama Locker per OR (for patient items)
- Moved sinks closer to Surgical Tables (cleaner hands!)
- Moved Light Fixtures down one tile (OCD plis)
- Removed Records Computer from OR foyer (also never used)
- Added beds to OR foyer (more waiting lines)
- Added NanoMed Vendor (SYMMETRY!!!)
- Removed central Disposals Chute (see below)
- Added table and cards (game with a show!)
- Added Disposals Chutes to each OR (DUNK THE LIVER)

Think that's all.
 2016-07-05 04:00:08 +01:00
Crazylemon64
ac3db33709 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-04 14:54:49 -07:00
TullyBurnalot
09dd3003d8 Fixes the Custodial Closet's (lack) of Scrubber Pipes 
There was a single Atmospherics Scrubbers pipe missing from the
Custodial Closet.

It's there now.
 2016-07-04 19:34:07 +01:00
FreeStylaLT
8b97b1d4c2 Fixed that re-appearing area bug. Changed lobby, re-added table to Warden. 2016-07-04 20:59:00 +03:00
FreeStylaLT
4e6000c47b Further tweaks genetics, changes RD's photocopier position, tweaks access on TComms sat's buttons to be same as rest of tcomms 2016-07-04 19:53:54 +03:00
FreeStylaLT
fad4528815 added new area icons for sec, changed processing and evidence room, various tweaks and fixes 2016-07-04 03:29:13 +03:00