cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,675 Commits 26 Branches 2 Tags
384bdc4d0aa23d2cc0f09d2a9fd1bf2fc43e5f4d
Commit Graph

7174 Commits

Author SHA1 Message Date
Aurorablade
384bdc4d0a Tweaks 
Fixed the errent space
Added a glass 'oil can' put two in robotcists locker (IPCS can drink oil to replenish it, this just makes it faster for the robos.)
 2018-08-10 01:53:28 -04:00
Aurorablade
ec66000ff7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-08-10 00:43:49 -04:00
Crazy Lemon
6a925fb205 Merge pull request #8515 from Kyep/depot 
Reworks Syndicate Supply Depot
 2018-08-07 09:34:02 -07:00
Kyep
cfce50fe8a moves core to /area/ subtype, bugfix 2018-08-06 23:17:30 -07:00
Kyep
d56f2105fd max_fire_range re-added 2018-08-06 21:26:53 -07:00
Kyep
477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Crazy Lemon
27c5aacdc1 Merge pull request #9306 from Tails2091/TherapyFix 
Fixed Therapy Doll Issue
 2018-08-05 18:39:12 -07:00
Tails2091
3c776efd1b Changed Card Icon Update 2018-08-03 15:39:20 -04:00
Tails2091
c668c25e96 Fixed Therapy Doll Issue 
Fixed issue #5167
Added icon update function to cards
Changed for loop to right format
Removed katana dupe
 2018-08-02 21:33:28 -04: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
variableundefined
7e216d32bd Add say logging for megaphone 2018-08-02 14:59:32 +08:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Kyep
7a493a5151 neca-inspired loot list adjustments 2018-07-31 17:48:02 -07:00
Tails2091
fef2b4c002 we the good format now 2018-07-29 13:53:45 -04:00
Tails2091
b08653c35a Changes while loop to for 
Why was this a while loop?
 2018-07-28 18:01:23 -04:00
Fox McCloud
8860a0a194 Merge pull request #9206 from Crazylemon64/maploader_fixup 
Fixes maploading so that the cyberiad and space hotel load cleanly again
 2018-07-26 23:25:21 -04:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
variableundefined
c9d05c6bb1 Lazylen! 2018-07-25 07:21:48 +08:00
variableundefined
973affbe44 Fixes runtime error from medical kit change 2018-07-24 20:43:44 +08:00
Aurorablade
1ebe3f908e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-07-23 18:21:04 -04: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
FalseIncarnate
26eb849509 merge conflict 2018-07-21 20:26:31 -04:00
Crazy Lemon
a5f2cb35cd Merge pull request #9223 from Fox-McCloud/what-is-this-species 
Makes Species datum Non-Global
 2018-07-21 17:01:33 -07:00
Fox McCloud
e1419cbd86 Merge pull request #9207 from Crazylemon64/admin_speed_process 
Adds an admin VV button to make any object speed process
 2018-07-21 17:32:14 -04: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
FalseIncarnate
f6de415d36 Food icon reorganization 
Moved around some food icons, to reduce clutter in the food.dmi file

Notable moves:
- All custom food icons are now in a new file custom.dmi
- All pizza icons (food and boxes) are now in a new file pizza.dmi
- All pasta food icons are now in a new file pasta.dmi

Also removed some duplicate icons, renamed some custom food icons for
better clarity, adjusted existing code to point to new icon locations
 2018-07-15 20:46:24 -04: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
Crazy Lemon
7e78920505 Merge pull request #9045 from Anasari/AdvancedKit 
Medical kit now uses overheal on eligible attached limbs
 2018-07-13 21:52:36 -07:00
Crazylemon64
5ad5b7382b Adds a var_edited update so it leaves fingerprints 2018-07-13 14:14:10 -07:00
Aurorablade
c295d4da36 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-07-12 18:20:12 -04: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
24e575da21 squash 2 2018-07-07 16:34:23 -07:00
Kyep
2e5f6fe6d5 squash 2018-07-07 16:32:00 -07:00
Kyep
f506319d9b Fox 5 2018-07-07 16:30:36 -07:00
Kyep
7c127fba67 portal Destroy() 2018-07-07 16:26:39 -07:00
Kyep
c3ed490159 Fox 4 2018-07-07 16:15:26 -07:00
Kyep
f7b0e03fc2 Fox 3 2018-07-07 16:14:01 -07:00
Kyep
6f5e8e1c18 Fox requests 2018-07-07 16:04:24 -07:00
datlo
0e9b583caf Combined table and floor check 2018-07-07 07:50:31 +01:00
Crazy Lemon
2a0733a008 Merge pull request #9151 from Fox-McCloud/pistol-change-loot 
Stechkin Maintenance Pistol Change
 2018-07-06 18:12:29 -07:00
tigercat2000
fcdb0fe54b Merge pull request #9172 from Fox-McCloud/no-lances 
Removes Explosive Lances
 2018-07-06 15:01:07 -07:00