cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,513 Commits 29 Branches 2 Tags
08fdc2bce3f20b3bbfbb3f11107ab2d5968165ad
Commit Graph

27919 Commits

Author SHA1 Message Date
Kyep
08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud
9f04939385 comment 2018-04-25 23:24:27 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
tigercat2000
e086908c44 Merge pull request #8897 from Fox-McCloud/adds-frame 
Adds F.R.A.M.E. Cartridge
 2018-04-25 18:57:29 -07:00
Fox McCloud
4243947e7a tweak 2018-04-25 21:48:44 -04:00
Fox McCloud
85691ec47e Merge pull request #8912 from tigercat2000/world_logging 
Post-logging overhaul tweaks
 2018-04-25 19:48:33 -04:00
tigercat2000
5fd9b42163 Revert all mob-code changes 2018-04-25 16:41:58 -07:00
tigercat2000
df26483e67 Fix runtime logs & Remove a bunch of painful admin notifications 2018-04-25 16:35:02 -07:00
tigercat2000
3bf0f18b52 Merge pull request #8916 from Tayyyyyyy/soap_qol 
Soap QOL
 2018-04-25 16:16:14 -07:00
tigercat2000
8f9f3eb42d Merge pull request #8899 from Fox-McCloud/no-radio-meta 
Removes Radio Icon Metagaming
 2018-04-25 16:16:04 -07:00
Tayyyyyyy
12aea54e84 Fix PM box revealing admin char, incorrect PM target for non-admins 2018-04-25 01:53:11 -05:00
Tigercat2000
f7b14ee073 Fix improperly placed logging.dm 2018-04-24 19:58:05 -07:00
tigercat2000
ad24d3a584 Merge pull request #8901 from Fox-McCloud/component-port 
Ports TG Components and R&D Tweaks
 2018-04-24 19:01:49 -07:00
Fox McCloud
abd8e3d1e2 Merge pull request #8908 from tigercat2000/aurora_caelus 
Adds the Aurora Caelus event, the deep-space equivalent of the northern lights.
 2018-04-24 21:18:17 -04:00
tigercat2000
fbfb48b2a8 Merge pull request #8911 from Tayyyyyyy/hide_pm_name 
Hide PM mob name from non-admins
 2018-04-24 18:11:00 -07:00
tigercat2000
5b68c2189c Merge pull request #8918 from Fox-McCloud/fluff-spawn-fix 
Fixes Random Plushie Spawning
 2018-04-24 18:09:11 -07:00
Fox McCloud
9860cf996e Fixes Random Plushie Spawning 2018-04-24 21:02:07 -04:00
Tayyyyyyy
8ecd9dd480 Fix coding style 2018-04-24 16:40:59 -05:00
Tayyyyyyy
ef20a187c0 Reduce soap clicks 2018-04-24 16:28:22 -05:00
Fox McCloud
727c66368b Merge pull request #8915 from Bram961/Cleanbot 
Cleanbot oversight
 2018-04-24 16:34:04 -04:00
Kluys
7160194295 Cleaning speed back to normal 
This is better done in a general cleaning/blood and dirt reduction update.
 2018-04-24 21:21:10 +02:00
Kluys
129930fb81 Cleanbot overslight/upgrade 
with the increase in blood decals the station is almost always a giant mess.

🆑 Kluys
Tweak: Cleanbots clean a decal twice as fast (movement speed remains the same)
Fix: Cleanblots not cleaning /obj/effect/decal/cleanable/trail_holder (blood trails)
/🆑
 2018-04-24 18:02:47 +02:00
Fox McCloud
d1750d15f2 derp 2018-04-24 02:28:02 -04:00
Fox McCloud
d216cf06b1 sprite revert 2018-04-24 02:14:58 -04:00
Fox McCloud
cadfeea3de consistency 2018-04-23 22:50:11 -04:00
Fox McCloud
7ee1221683 robotic fabricator 2018-04-23 22:25:53 -04:00
Fox McCloud
a58c2a8693 smelter to components 2018-04-23 19:56:27 -04:00
Tayyyyyyy
854422565c Hide PM mob name from non-admins 2018-04-23 18:19:28 -05:00
Fox McCloud
a431b92c61 forgot this 2018-04-23 15:47:49 -04:00
Fox McCloud
7c8299d443 mint machine 2018-04-23 15:44:29 -04:00
Fox McCloud
eafd57487c Merge remote-tracking branch 'upstream/master' into component-port 
# Conflicts:
#	paradise.dme
 2018-04-23 13:54:50 -04:00
Tayyyyyyy
e09bfc27c9 Fix PM type being wrong 2018-04-23 00:19:39 -05:00
tigercat2000
8c1e61f63f Adds the aurora caelus event, the space equivelent of the northern lights. 2018-04-22 21:10:45 -07:00
Crazy Lemon
6011f49f17 Merge pull request #8896 from tigercat2000/logging_standards 
Completely Overhaul Logging
 2018-04-22 18:27:27 -07:00
Fox McCloud
49fcd92040 pod fabricator 2018-04-22 18:23:27 -04:00
Fox McCloud
8e186735e1 welp 2018-04-22 07:27:33 -04:00
Fox McCloud
0b32cba04d bluespace in R&D 2018-04-22 07:24:17 -04:00
Fox McCloud
71e4eba8e5 mech fab 2018-04-22 07:12:00 -04:00
Fox McCloud
9adfe9542a whoops 2018-04-22 00:44:41 -04:00
Fox McCloud
4306d27521 circuit imprinter update 2018-04-22 00:34:06 -04:00
tigercat2000
b220b7f886 Actually make compile 2018-04-21 21:13:53 -07:00
Fox McCloud
7acc4c686a almost forgot 2018-04-21 20:35:39 -04:00
Fox McCloud
32e3a25070 got it 2018-04-21 20:25:14 -04:00
tigercat2000
c7089467bc Readd shields to attackhand 2018-04-21 12:41:12 -07:00
Sam
a316c544f4 ree 2018-04-21 15:23:27 +01:00
Fox McCloud
e82bc17904 makes it actually work 2018-04-21 06:34:46 -04:00
Fox McCloud
5116164582 part 1 2018-04-21 06:13:11 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
Fox McCloud
311c4ba592 Removes Radio Icon Metagaming 2018-04-20 18:23:30 -04:00
Fox McCloud
25d331b0bb tweak 2018-04-19 21:14:00 -04:00