cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,488 Commits 26 Branches 2 Tags
21aa88ca59b294e2220cffce0a96cb56d31f4021
Commit Graph

1725 Commits

Author SHA1 Message Date
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -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
Fox McCloud
32e3a25070 got it 2018-04-21 20:25:14 -04:00
tigercat2000
c03621c508 Completely Overhaul Logging 
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
 2018-04-19 15:07:59 -08:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
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
57a4be2138 Merge pull request #8794 from Birdtalon/fixes 
Fixes and tweaks
 2018-04-06 20:02:07 -07: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
tigercat2000
e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	paradise.dme
 2018-03-30 10:20:21 -07:00
Fox McCloud
22dc6860b3 Ports TG's Garbage Subsystem 2018-03-28 20:02:39 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Birdtalon
18a43b8039 Revert "adds admin notification for black powder reaction" 
This reverts commit c466f0e98e.
 2018-03-26 22:33:54 +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
Birdtalon
c466f0e98e adds admin notification for black powder reaction 2018-03-23 18:32:58 +00:00
Birdtalon
886b2ad8d9 nanocalcium reagent restriction 2018-03-23 17:35:15 +00:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium 
Nanocalcium: Bone repair drug.
 2018-03-19 13:37:20 -07:00
tigercat2000
cd6b8dfe45 Merge pull request #8566 from Aurorablade/BuffsVulpkanin 
Tips the Scales
 2018-03-19 11:27:35 -07:00
Aurorablade
6aec682631 Diona needing water revert 
Still have hair.
 2018-03-19 02:05:16 -04:00
Piccione
06fa27ac28 I changed the taste description of a few food items 2018-03-10 21:48:55 +01:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee 
Coffee Mugs and Vendor Change
 2018-03-03 10:32:54 -08:00
Aurorablade
0e558f5b51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BuffsVulpkanin 2018-03-01 19:55:48 -05:00
Birdtalon
7283431211 descriptions updated by request 2018-02-27 15:13:41 +00:00
Birdtalon
904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Birdtalon
aa31461979 adds sound effect, reformats guide 2018-02-22 19:14:56 +00:00
Birdtalon
908d2ae53a addresses reviews - remove redundancies, changes some spans 2018-02-22 10:54:29 +00:00
Birdtalon
fa213c351f makes the third cycle work until all reagent is gone. 2018-02-21 20:55:43 +00:00
Birdtalon
fe914dc5f5 finishes effects, adds nanocalcium auto-injector, adds bone repair kit to uplink. adds sprites. 2018-02-21 20:44:03 +00:00
Birdtalon
8d45200f20 adds nanocalcium and starts adding effects 2018-02-21 16:42:36 +00:00
Birdtalon
d8b6b7b4c9 reduces ether metabolism rate, increases time before knockout 2018-02-21 15:32:56 +00:00
alexkar598
3bf4ffcc62 DIE OLD CODE,DIE! 2018-01-26 13:50:56 -05:00
FalseIncarnate
23c883bd57 Coffee Mugs and Vendor Change 
Adds coffee mugs
- Available from hot drink vendors or loadout menu (1 point)

Adds novelty coffee mugs
- Available as a premium item from the hot drinks vendors or from the
loadout menu (2 points)

Adds support for an "item slot" in vendors, which allows an item to be
inserted into a vendor.

Adds the ability to add containers into the hot drinks machine.
- Will attempt to fill the inserted container with purchased beverages.
- Excess will still dispense in a new cup, as if there was not a
container present.

🆑
rscadd: Adds coffee and novelty mugs to the hot drinks machine and
loadout menu.
rscadd: Adds the ability to insert containers into the hot drink
machine, filling the container with your purchase.
/🆑
 2018-01-22 22:46:03 -05:00
Aurorablade
2e04a8916a Rustles Vox 2018-01-20 00:17:52 -05:00
Aurorablade
8ffc329672 Nerfs Skrell 2018-01-18 23:26:22 -05:00
tigercat2000
c1c4b08807 Merge pull request #8476 from uraniummeltdown/decon 
deconstruct() at obj level + other changes
 2018-01-02 10:28:17 -08:00
tigercat2000
591f718995 Merge pull request #7848 from KasparoVy/splat 
Splatter Lands 1 Tile Away in Target Dir & Xeno-blood Splatter Colour Fix
 2017-12-31 08:00:14 -08:00
uraniummeltdown
75e177b7a9 renames receive_damage() for animations to receiving_damage() 
renames take_damage() for organs to receive_damage()
renames Deconstruct() to deconstruct() for atmos objects
obj_integrity, max_integrity, integrity_failure vars moved to /obj level, obj_integrity = max_integrity on New()
 2017-12-28 00:32:54 +05:00
FreeStylaLT
ebb44a45d2 adds a toxic pill sprite, makes the toxin and cyanide pills use it 2017-12-27 20:42:55 +02:00
Kyep
1c3b1957cb Fixes merge conflict 2017-11-28 22:39:01 -08:00
tigercat2000
02615c4e43 Merge pull request #8388 from Fox-McCloud/slime-fix 
Fixes Slime Transformation
 2017-11-26 13:03:24 -08:00
tigercat2000
77810081e7 Merge pull request #8331 from uraniummeltdown/effectfiles 
Splits effect_system.dm into multiple files and cleans it up, OOP particle effects and effect systems
 2017-11-26 12:35:01 -08:00
tigercat2000
0dfdc8ae2a Merge pull request #8302 from Kyep/better_service_borgs 
Buffs Service Borgs
 2017-11-26 12:15:25 -08:00
Fox-McCloud
0e19a4d00c Fixes Slime Transformation 2017-11-20 12:11:59 -05:00
Crazy Lemon
86676221b5 Merge pull request #8242 from Allfd/vamp 
Makes vampires more containable
 2017-11-10 12:29:43 -08:00
Alffd
a1c085ac0c Makes blood loss more reasonable 2017-11-10 14:03:02 -05:00
uraniummeltdown
7ed2c68ea7 compiles, find and replace particle_effect and effect_system 2017-11-04 20:16:01 +04:00
uraniummeltdown
a0939ca93b finish making smoke OOP, compiles 2017-11-03 22:46:49 +04:00
Landerlow
78daffe4ae Adds sake to hacked booze dispenser 2017-10-27 18:36:59 +02:00
tigercat2000
a5e4ccdc18 Merge pull request #8103 from FalseIncarnate/reagents 
Silver Slime Core and Random Reagent changes
 2017-10-27 09:23:50 -07:00
FalseIncarnate
58bfb314d0 compromise 2017-10-26 21:01:05 -04:00
Kyep
f8910a881a Buffs Service Borgs 2017-10-24 02:37:43 -07:00