cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,300 Commits 26 Branches 2 Tags
a1c2da04fe681c1eee6592e50fa720422a9ca628
Commit Graph

2834 Commits

Author SHA1 Message Date
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
f7521320a0 fixes the runtimes 2018-04-04 19:14:22 -04:00
Fox McCloud
39c5aa0bf7 one Destroy loop fix 2018-04-04 06:03:45 -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
Kyep
b0fb593210 Better ID computer logging 2018-04-02 19:09:50 -07: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
c535a6cd59 Merge pull request #8804 from MINIMAN10000/rcd-lattice 
RCD floors work on lattice & space
 2018-04-01 21:23:07 -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
tigercat2000
e71c4279a7 Merge remote-tracking branch 'upstream/master' into night_shift 
# Conflicts:
#	paradise.dme
 2018-03-30 10:20:21 -07:00
Birdtalon
b334bc4a88 defibrillator no longer yields infinite paddles 2018-03-30 13:12:44 +01: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
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
MINIMAN10000
a9317230c3 Allows player to place floors by clicking on lattice instead of clicking between the lattice 2018-03-23 19:14:01 -07:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC 
# Conflicts:
#	code/__DEFINES/flags.dm
 2018-03-22 15:35:12 -07:00
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks 
[READY] Attack Code Update
 2018-03-22 11:55:53 -07:00
alexkar598
bcae1222e1 i should of kept it as it was huh 2018-03-20 19:25:43 -04:00
alexkar598
df70fc1b6d whoopsy 2018-03-20 17:26:32 -04:00
alexkar598
13d02eb490 makes stun prods great again 2018-03-20 17:21:21 -04:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium 
Nanocalcium: Bone repair drug.
 2018-03-19 13:37:20 -07:00
tigercat2000
7bee9ab6dc Merge pull request #8761 from IK3I/WrathOfSinguloth 
Bags of bags of holding no longer possible.
 2018-03-19 11:54:52 -07:00
IK3I
e9f3ee5cf5 No. 2018-03-13 22:48:23 -05:00
tigercat2000
c4d4c3e23a Merge pull request #8733 from PigeonLord/nabber 
Added Medical Marijuana Packets for the Psychologist
 2018-03-13 04:58:04 -07:00
tigercat2000
27314fded9 Merge pull request #8752 from Citinited/pipes-exploit-fix 
Restricts RPD use to certain turf types
 2018-03-13 04:57:15 -07:00
Citinited
6441dde560 Removes some obsolete code 2018-03-12 19:20:15 +00:00
Citinited
4bba349cb6 Adds RPD_ALLOWED_HERE flag to deny use of the RPD to certain turf types 2018-03-11 03:44:42 +00:00
Piccione
8799c0cf42 Put the correct drug id in the cigarette for THC 2018-03-08 23:24:33 +01:00
Piccione
35f1956db7 Switched the Space Drugs in the Weed Cigarettes with more healthy THC 2018-03-08 23:18:54 +01:00
Piccione
3bcc12bd94 Added Weed Packets 2018-03-06 22:22:10 +01:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level 
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
 2018-03-04 13:52:54 +05:00
uraniummeltdown
d6a277a224 fix incorrect match path 
can butcher with any sharp item on harm intent
simple_animal/attacked_by()
moved var/foldable to box level
some fixes with attack code
updated slime code, can now mousedrop as a slime to feed on mobs
adds sound to simple_animal/attackby
 2018-03-04 13:52:53 +05:00
uraniummeltdown
01551ec248 refactor match and lighter code to use procs, some code cleanup 
lighting mobs on fire with a match is now logged
 2018-03-04 13:52:53 +05:00
uraniummeltdown
e6ded64e4a adds /mob/living/proc/attacked_by() 
updates attack and defense code
adds missing sounds to some items, code cleanup, lowered volume for some sounds (from /tg/)
hitsound and attack_verb updates, weapons given hitsound on New() according to damage type
 2018-03-04 13:52:52 +05:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee 
Coffee Mugs and Vendor Change
 2018-03-03 10:32:54 -08:00
tigercat2000
dca16e60cf PS -> SMC Ports: LINDA, Spacedrift, Throwing 
This commit ports LINDA, spacedrifting, and throwing to the SMC.
 2018-03-02 23:58:57 -08:00
Birdtalon
7283431211 descriptions updated by request 2018-02-27 15:13:41 +00:00
shugnk
bbd681e369 Manuals.dm fix 
Fixed Dat descriptions and Iframes. Also fixed nanotrasen letter case
 2018-02-25 20:02:48 -05:00
shugnk
a0d65887b3 Delete manuals.dm 2018-02-25 20:01:20 -05:00
shugnk
cd90c3a328 fix again 2018-02-25 19:55:08 -05:00
shugnk
7325527024 Fix DAT and Iframes for Books 
With NanoTrasen changed to Nanotrasen as well
 2018-02-25 19:52:48 -05:00
Birdtalon
aa31461979 adds sound effect, reformats guide 2018-02-22 19:14:56 +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
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral 
Titanium
 2018-02-21 03:20:20 -05:00
uraniummeltdown
edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff 
Buffs IEDs
 2018-02-19 21:45:05 -08:00
Fox McCloud
1e1146cd21 changes 2018-02-20 00:33:22 -05:00
Aurorablade
20ddaccb9b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DisMemberments 2018-02-08 02:31:44 -05:00
tigercat2000
93610061e0 Merge pull request #8590 from IK3I/RiseOfSpork 
The Utensil of the future!
 2018-02-05 12:49:59 -08:00
tigercat2000
ee894f887a Merge pull request #8556 from Tayyyyyyy/glowing_eswords 
Esword visual update
 2018-02-05 12:49:42 -08:00