cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,033 Commits 26 Branches 2 Tags
fb80e1a66d4e09805f9727ce8e6b2fb7de46ad1a
Commit Graph

2959 Commits

Author SHA1 Message Date
Crazy Lemon
5f11e5945e Merge pull request #9367 from TDSSS/hypospray-belt 
Allows medical belts to hold hyposprays
 2018-09-04 09:21:37 -07:00
Unknown
62c7ba1f80 Merge remote-tracking branch 'upstream/master' into Memes 2018-08-29 19:23:06 +02:00
Crazy Lemon
e8e5928edd Merge pull request #9430 from FlattestGuitar/forceMove 
you can remove items from storage with forceMove() properly
 2018-08-29 08:29:26 -07:00
variableundefined
b874549978 Ensure bola cannot snare anyone without enough legs 2018-08-28 22:35:31 +08:00
Unknown
b89eec6ce6 forceMove for storage item removal 2018-08-28 10:22:45 +02:00
TDSSS
503f9b9166 Fixed indentation 2018-08-23 12:34:06 +02:00
Crazy Lemon
058d339493 Merge pull request #9336 from Kyep/depot_fixes_1 
Depot Fixes
 2018-08-22 22:33:09 -07:00
Crazy Lemon
b3f5af433a Merge pull request #9371 from variableundefined/DefibPaddleDetach 
Defib paddles snap away if you walk away from the defib
 2018-08-22 22:27:03 -07:00
Crazy Lemon
bf8520528c Merge pull request #9257 from variableundefined/WelderCableOverheal 
Adds overheal to welder & cable coil
 2018-08-22 22:15:38 -07:00
variableundefined
80123d90ad Stop implantcase from disappearing 2018-08-22 22:36:02 +08:00
variableundefined
845401725e Defib paddles snap away if you walk away from the defib 2018-08-16 21:49:39 +08:00
TDSSS
12a2660619 added hyposprays to medbelt 2018-08-16 14:32:37 +02:00
Kyep
1e894f11ee CrazyLemon RPD changes 2018-08-15 22:36:53 -07:00
Kyep
7cebfc20c4 fixes for RPD and RCS exploits 2018-08-15 01:48:34 -07:00
Superhats
90874a1e94 Merge pull request #2 from Superhats/master 
Whoops, i was super behind
 2018-08-10 10:55:03 +02:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Kyep
45a88d4f3f split teleportation changes out into another PR 2018-08-02 09:36:10 -07:00
Kyep
ce4775c6af z6 mapmerge, teleportation.dm refactor, stop bluespace tomatoes working in tele_proof areas 2018-08-02 09:03:17 -07:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
variableundefined
eaf4d642cb Adds overheal to welder & cable coil 2018-07-26 22:22:50 +08:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
FalseIncarnate
d4bada645a Fixes invisible egg and donut boxes 
Also removed duplicate instances of the pizza box icons
 2018-07-22 15:33:21 -04:00
Superhats
9f575c6281 Update firstaid.dm 2018-07-20 13:00:50 +02:00
Fox McCloud
c6bb2ecd4d abductor stuff 2018-07-18 19:51:22 -04:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud
9c3fcaa53c AGHHHHHHHHHHHHH 2018-07-17 02:13:52 -04:00
Crazy Lemon
384fe93d33 Merge pull request #8975 from Citinited/rpd-refactor 
RPD refactor
 2018-07-16 14:22:38 -07:00
Citinited
29c6e6d69b A bunch of refactoring; RPD runtimes if a forbidden pipe is attempted to be dispensed; names loose disposals pipes 2018-07-16 00:23:03 +01:00
Fox McCloud
b2c8f051b1 Merge remote-tracking branch 'upstream/master' into camera-damage-refactor 2018-07-15 16:31:50 -04:00
Superhats
4eb2d7e397 Bye bye, combat defib 2018-07-15 21:00:47 +02:00
Superhats
bf5b7e822e Re-adds advanced magboots, a bunch of implants, safety on the defib 2018-07-15 18:50:02 +02:00
Superhats
6704f2b999 yeet 2018-07-15 00:29:08 +02:00
Crazy Lemon
74f7028fa7 Merge pull request #9177 from datlo/RSFfix 
Fixes Service Borg's RSF being unable to dispense items on floors
 2018-07-11 12:43:30 -07:00
Fox McCloud
9463807ac2 done 2018-07-09 05:45:01 -04:00
Fox McCloud
27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
Kyep
c3ed490159 Fox 4 2018-07-07 16:15:26 -07:00
datlo
0e9b583caf Combined table and floor check 2018-07-07 07:50:31 +01:00
tigercat2000
fcdb0fe54b Merge pull request #9172 from Fox-McCloud/no-lances 
Removes Explosive Lances
 2018-07-06 15:01:07 -07:00
datlo
e4215cf0f5 Actually allows RSF to spawn on floors 
derp'd
 2018-07-06 06:57:53 +01:00
datlo
d26b4c4e7e Allows RSF to spawn items on floors 2018-07-06 06:37:52 +01:00
datlo
84ae085166 Changes RSF error message to be more accurate 
The RSF cannot, in fact, create service items on floors. As amusing as
dosh on every floor tile would be, I think it's best to just change the
message and not functionality.
 2018-07-05 16:10:53 +01:00
tigercat2000
9697bd082f Merge pull request #9171 from Citinited/jon-is-no-longer-custom 
Fixes spelling error
 2018-07-03 15:47:57 -07:00
Fox McCloud
319a6cd500 Removes Explosive Lances 2018-07-03 18:13:51 -04:00
Citinited
a7dc1d70e9 Fixes speling error 2018-07-03 16:30:30 +01:00
Kyep
3fb7a5e526 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-06-28 18:02:48 -07:00
Kyep
7d361cf59b made some traps fairer 2018-06-22 01:05:03 -07:00
MINIMAN10000
868167d84c Fix cardboard drop count 2018-06-19 13:38:02 -07:00
Fox McCloud
8dcc35edd5 Fixes Home-Run Bat Charge 2018-06-18 16:48:12 -04:00
Kyep
5e6407e3f8 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-06-13 23:42:36 -07:00