cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 20:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,300 Commits 26 Branches 2 Tags
a1c2da04fe681c1eee6592e50fa720422a9ca628
Commit Graph

17190 Commits

Author SHA1 Message Date
tigercat2000
a1c2da04fe Merge pull request #8705 from Birdtalon/ether 
Re balances ether into a better anaesthetic
 2018-04-06 20:21:04 -07:00
tigercat2000
367ed46b79 Merge pull request #8618 from Kyep/xeno_window 
Deletes Xenobio SIT docking port
 2018-04-06 20:13:37 -07:00
tigercat2000
86f89382c4 Merge pull request #8834 from Crazylemon64/hotelsec_lootnerf 
Nerfs loot-pinata-ing of hotel guards
 2018-04-06 20:07:30 -07:00
tigercat2000
57a4be2138 Merge pull request #8794 from Birdtalon/fixes 
Fixes and tweaks
 2018-04-06 20:02:07 -07:00
tigercat2000
413832ee27 Merge pull request #8837 from Kyep/better_demotions 
Better ID computer logging
 2018-04-06 20:01:38 -07:00
Fox McCloud
af7abe2679 Makes Stacks Garbage Collect 2018-04-06 19:32:08 -04:00
tigercat2000
639c40d140 Merge pull request #8824 from Fox-McCloud/gc-ss-port 
Ports TG's Garbage Subsystem
 2018-04-05 20:49:04 -07:00
Fox McCloud
9901fa4154 tweaks 2018-04-05 23:36:34 -04:00
Fox McCloud
f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
Ty-Omaha
e5ded5dba9 fixes typo 2018-04-04 11:11:27 -04:00
Fox McCloud
29a59cc06d modular computer/software destroy fix 2018-04-04 07:04:23 -04:00
Fox McCloud
1d80bf01c0 Merge remote-tracking branch 'upstream/master' into gc-ss-port 
# Conflicts:
#	paradise.dme
 2018-04-03 18:21:04 -04:00
Fox McCloud
b61766fbc5 Merge pull request #8812 from tigercat2000/night_shift 
Nightshifts & Randomized Station Time
 2018-04-03 18:09:09 -04:00
Kyep
051e7755d8 darn modular computers 2018-04-03 01:27:22 -07:00
tigercat2000
8fae4e380f Merge pull request #8840 from Fox-McCloud/spacevine-fix 
Fixes Unkillable Spacevines
 2018-04-02 21:16:29 -07:00
Fox McCloud
c22025abfa Fixes Unkillable Spacevines 2018-04-03 00:08:56 -04:00
tigercat2000
8e5a42a7a1 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	code/world.dm
 2018-04-02 17:24:36 -07:00
Crazy Lemon
d07ef9a1ec Merge pull request #8793 from DesolateG/Cricketborg 
Adds Cricket Borgs to appearance selection for Cyborgs.
 2018-04-01 23:46:03 -07:00
Crazylemon64
002684fa5d Hotel space guards now fight back more meaningfully 
and now dust on death to prevent loot pinata-ing
 2018-04-01 22:26:32 -07:00
Kyep
322dc17154 deletes from shuttle controller, squash 2018-04-01 21:59:12 -07:00
Crazy Lemon
43671698cd Merge pull request #8490 from Kyep/pet_tweaks 
Station Pet Tweaks
 2018-04-01 21:53:51 -07:00
Kyep
39e0612683 deletes pushing changes 2018-04-01 21:43:24 -07:00
Kyep
2c02c7bbc0 Removes pulling changes 2018-04-01 21:29:28 -07:00
Crazy Lemon
d883b962df Merge pull request #8826 from EldritchSigma/patch-1 
Fixes Mech Disablers being not printable half the time
 2018-04-01 21:21:29 -07:00
tigercat2000
27dceb6131 Merge pull request #8613 from shazbot194/E-pistols 
Adds in energy pistols
 2018-04-01 20:42:42 -07:00
tigercat2000
64c3bd0eb0 Merge pull request #8754 from IK3I/SubversionOfTheSubverted 
When you're not in the mood...
 2018-04-01 20:38:21 -07:00
IK3I
1350dfa0c2 Updates wording 2018-04-01 22:30:50 -05:00
shazbot194
adcf2dcada Merge fix 2018-04-01 19:17:48 -08:00
tigercat2000
f05aac5715 Merge pull request #8658 from Tayyyyyyy/borg_qol 
Borg QOD improvements
 2018-04-01 19:56:39 -07:00
tigercat2000
f6dad122ba Merge pull request #8357 from Aurorablade/VirusNostolgia 
Wherein Fethas proves to be evil incarnate
 2018-04-01 19:22:31 -07:00
tigercat2000
0f4c25f91c Merge pull request #8528 from Tayyyyyyy/robot_talk 
Make robot talk easier to read
 2018-04-01 18:52:27 -07:00
tigercat2000
aa8038c4e7 Merge pull request #8616 from Tayyyyyyy/shuttle_cheese 
Reduce shuttle cheese
 2018-04-01 18:48:31 -07:00
tigercat2000
e67ba4ecd8 Merge pull request #8503 from Kyep/frikin_laser_beams 
Fixes #6229 - tripwire mines not working / brings back frikin' laser beams
 2018-04-01 18:47:31 -07:00
EldritchSigma
15d30b457e Fixes Mech Disablers being not printable half the time 
Apparently the Firedart and Mech-Disabler have the same ID for some bizarre reason. This PR fixes it. Its a minor fix and my first PR. Its basicly just changing one line to fix this pretty decent mech weapon to make it printable like it is every now and then.

Cause its weird that you can print it from round to round, but most of the time you can only print the stupid firedart.
 2018-03-30 19:20:51 +02:00
tigercat2000
e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	paradise.dme
 2018-03-30 10:20:21 -07:00
Fox McCloud
a94ffdb49f Merge pull request #8790 from matt81093/inf_fish_fix 
Fixes infi fish issue
 2018-03-29 23:55:04 -04:00
Fox McCloud
4bbb854372 last tweaks 2018-03-29 01:21:17 -04:00
Fox McCloud
7f842e3223 no more runtimes 2018-03-29 00:44:53 -04:00
Fox McCloud
1f13b6a449 queue the deletes 2018-03-28 20:19:28 -04:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud
a7bab46b3b Removes Stat Throttle 2018-03-28 15:50:58 -04:00
Fox McCloud
067f5cf8e8 Merge pull request #8717 from GunDOSMk1/Norstead's-Fluff 
Norstead's fluff : Soviet Casual Uniform
 2018-03-28 15:41:18 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
tigercat2000
affc986684 Fix time shit & Add secrets verb 2018-03-26 20:16:22 -07:00
tigercat2000
c13ce9099f Merge pull request #8810 from Fox-McCloud/sun-subsystem 
Ports Sun Controller to Subsystem
 2018-03-26 15:21:02 -07:00
Birdtalon
18a43b8039 Revert "adds admin notification for black powder reaction" 
This reverts commit c466f0e98e.
 2018-03-26 22:33:54 +01:00
tigercat2000
931068c261 Merge pull request #8818 from Birdtalon/bluespace-cheese 
Stops bluespace Cheese cheese
 2018-03-26 14:11:00 -07:00
Birdtalon
941b8c2389 recursive checking for putting objects inside slicable foods 2018-03-26 20:19:11 +01:00
tigercat2000
bc4fb3d79b Nightshifts & Randomized Station Time 
This commit adds the Nightshift lighting mode from /tg/. From 19:00 to
07:00 in station time, the station will go into a reduced-lighting mode,
with dimmed lights across the station.

In conjunction with this, there is a new configuration option to start
the shift time at a random time other than 12:00, so that players are
more likely to experience a night shift (as opposed to having to have a
7 hour round).
 2018-03-25 23:01:04 -07:00
Fox McCloud
2b6a6eb812 Ports Sun Controller to Subsystem 2018-03-25 19:23:26 -04:00