cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 17:46:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,244 Commits 17 Branches 2 Tags
0d71bf4388070edaeb2ebf3979c93fb39f677464
Commit Graph
27726 Commits
Author SHA1 Message Date
Citinited 0d71bf4388 obj/machinery/kitchen_machine/New now calls ..() 2018-04-14 11:21:54 +01:00
Ty-Omaha e5ded5dba9 fixes typo 2018-04-04 11:11:27 -04:00
Fox McCloudandGitHub b61766fbc5 Merge pull request #8812 from tigercat2000/night_shift 
Nightshifts & Randomized Station Time
 2018-04-03 18:09:09 -04:00
tigercat2000andGitHub 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
tigercat2000andGitHub 7e2c51f0e0 Merge pull request #8829 from Allfd/listed 
Migrate listing controls to byond
 2018-04-02 14:58:50 -07:00
Crazy LemonandGitHub d07ef9a1ec Merge pull request #8793 from DesolateG/Cricketborg 
Adds Cricket Borgs to appearance selection for Cyborgs.
 2018-04-01 23:46:03 -07:00
Alffd e7a198d5cf Revert "Remove the /" 
This reverts commit b22b9e53fd.
 2018-04-02 01:05:10 -04:00
Crazy LemonandGitHub 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 LemonandGitHub c535a6cd59 Merge pull request #8804 from MINIMAN10000/rcd-lattice 
RCD floors work on lattice & space
 2018-04-01 21:23:07 -07:00
Crazy LemonandGitHub 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
tigercat2000andGitHub 27dceb6131 Merge pull request #8613 from shazbot194/E-pistols 
Adds in energy pistols
 2018-04-01 20:42:42 -07:00
tigercat2000andGitHub 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
AlffdandGitHub b22b9e53fd Remove the / 2018-04-01 22:58:24 -04:00
tigercat2000andGitHub f05aac5715 Merge pull request #8658 from Tayyyyyyy/borg_qol 
Borg QOD improvements
 2018-04-01 19:56:39 -07:00
tigercat2000andGitHub f6dad122ba Merge pull request #8357 from Aurorablade/VirusNostolgia 
Wherein Fethas proves to be evil incarnate
 2018-04-01 19:22:31 -07:00
tigercat2000andGitHub b36703f6c5 Merge pull request #8478 from Vivalas/fuck_air_alarms 
Fixes air alarms
 2018-04-01 19:21:35 -07:00
tigercat2000andGitHub 54843818df Merge pull request #8821 from Kyep/end_the_pool_spam 
stops poolcontroller drowning sending messages to admins
 2018-04-01 19:16:54 -07:00
tigercat2000andGitHub 0f4c25f91c Merge pull request #8528 from Tayyyyyyy/robot_talk 
Make robot talk easier to read
 2018-04-01 18:52:27 -07:00
tigercat2000andGitHub aa8038c4e7 Merge pull request #8616 from Tayyyyyyy/shuttle_cheese 
Reduce shuttle cheese
 2018-04-01 18:48:31 -07:00
tigercat2000andGitHub 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
Alffd e919c22350 Migrate listing controls to byond. 
Inspired by a MSO post.
 2018-03-31 16:55:37 -04:00
EldritchSigmaandGitHub 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 McCloudandGitHub a94ffdb49f Merge pull request #8790 from matt81093/inf_fish_fix 
Fixes infi fish issue
 2018-03-29 23:55:04 -04:00
Kyep ffe578808f spaces 2018-03-28 21:12:26 -07:00
Fox McCloud a7bab46b3b Removes Stat Throttle 2018-03-28 15:50:58 -04:00
Fox McCloudandGitHub 067f5cf8e8 Merge pull request #8717 from GunDOSMk1/Norstead's-Fluff 
Norstead's fluff : Soviet Casual Uniform
 2018-03-28 15:41:18 -04:00
Kyep 9aca23aaba Only notify if mob is SSD 2018-03-27 16:36:26 -07:00
Kyep af3e632a09 stops poolcontroller drowning sending messages to admins 2018-03-27 15:16:19 -07:00
Fox McCloud d56068efac tweak 2018-03-27 00:09:35 -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
tigercat2000andGitHub c13ce9099f Merge pull request #8810 from Fox-McCloud/sun-subsystem 
Ports Sun Controller to Subsystem
 2018-03-26 15:21:02 -07:00
Fox McCloud 29de229c9b less space 2018-03-26 18:10:10 -04:00
tigercat2000andGitHub 7ac8dc037f Merge pull request #8791 from alexkar598/icon_override 
Allows item_action to not use the item icon by adding a var to let it not do so
 2018-03-26 14:16:47 -07:00
tigercat2000andGitHub 4d97ca3a91 Merge pull request #8809 from MarsM0nd/Record_naming 
QoL addition to record printouts
 2018-03-26 14:15:04 -07:00
tigercat2000andGitHub 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
Alffd 39d93654f4 Remove stun 2018-03-25 22:47:12 -04:00
Alffd 8c86e9a08d Changes to pathing calculations, prevent wasted calculations 2018-03-25 22:46:22 -04:00
Alffd 82c20d0041 Updated for SSair 2018-03-25 21:49:02 -04:00
Fox McCloud 2b6a6eb812 Ports Sun Controller to Subsystem 2018-03-25 19:23:26 -04:00
tigercat2000andGitHub 338631744f Merge pull request #8798 from Fox-McCloud/fire-subsystem 
Ports over Fires to Subsystems
 2018-03-25 16:02:31 -07:00