shazbot194
1747f9e31e
Small code improvements and description reverts
2018-04-14 17:25:56 -08:00
Fox McCloud
129e1f66f7
GC radio stuffs
2018-04-14 13:44:26 -04:00
MINIMAN10000
d4a98ea09f
Moved var/to_transfer back to /obj/item/stack turns out it's fine there
2018-04-13 19:50:26 -07:00
MINIMAN10000
5d52f60d9d
Comment about where merging is handled, moved to_transfer variable to immediately above where it is used
2018-04-13 18:27:20 -07:00
MINIMAN10000
e875af3d56
Cable Coils can partial transfer, stripped depereciated code, changed cable coil message
2018-04-13 16:48:14 -07:00
CoreyLee Hassell
5cef36efdf
Changed defib timer from 3 minutes to 5 minutes
2018-04-12 18:39:54 -04:00
Kyep
2cb4e1f75c
Fox requests
2018-04-08 08:03:34 -07:00
Fox McCloud
196d0b90f9
Makes Records GC (most of the time)
2018-04-07 23:38:10 -04:00
Kyep
ca8bb33a58
Tiger requests
2018-04-07 14:01:48 -07:00
tigercat2000 and GitHub
a7b6e00bd3
Merge pull request #8853 from Dyhr/master
...
Agent ID occupation options
2018-04-06 20:54:43 -07:00
tigercat2000 and GitHub
464e1a18da
Merge pull request #8722 from Citinited/don't-lose-your-head
...
Refactors the russian revolver, and you can no longer play RR without a head
2018-04-06 20:24:54 -07:00
tigercat2000 and GitHub
57a4be2138
Merge pull request #8794 from Birdtalon/fixes
...
Fixes and tweaks
2018-04-06 20:02:07 -07:00
tigercat2000 and GitHub
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
Rasmus Dyhr Larsen
5065221dd6
Added agent id occupation options
2018-04-05 23:59:50 +02:00
Fox McCloud
f7521320a0
fixes the runtimes
2018-04-04 19:14:22 -04:00
shazbot194
234c8a78bc
Merge conflict fix
2018-04-04 12:18:07 -08: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 and GitHub
c535a6cd59
Merge pull request #8804 from MINIMAN10000/rcd-lattice
...
RCD floors work on lattice & space
2018-04-01 21:23:07 -07:00
Kyep
1b6b1deecc
fixes merge conflict in custom_grenades.dm
2018-04-01 18:59:25 -07:00
tigercat2000 and GitHub
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
FalseIncarnate
e78bb385e2
Replaces obsolete HTML tags
...
<TT> tags are obsolete, replacing them with <code> tags which are not.
Not really any major difference, both are monospace fonts.
2018-03-26 21:37:23 -04:00
Kyep
e014f02324
Improves admin outfits, fixes magboots being missing
2018-03-26 15:44:17 -07: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
FalseIncarnate
7a2e065a10
Adds mixing bowls
2018-03-25 21:44:38 -04:00
Matthew Kelley
f0784af617
Resets borg special vision when reset
2018-03-24 01:29:00 -05: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 and GitHub
b1278de3d2
Merge pull request #8674 from uraniummeltdown/attacks
...
[READY] Attack Code Update
2018-03-22 11:55:53 -07:00
alexkar598 and GitHub
bcae1222e1
i should of kept it as it was huh
2018-03-20 19:25:43 -04:00
alexkar598 and GitHub
df70fc1b6d
whoopsy
2018-03-20 17:26:32 -04:00
alexkar598 and GitHub
13d02eb490
makes stun prods great again
2018-03-20 17:21:21 -04:00
tigercat2000 and GitHub
5a756ad3c9
Merge pull request #8708 from Birdtalon/nanocalcium
...
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
tigercat2000 and GitHub
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 and GitHub
c4d4c3e23a
Merge pull request #8733 from PigeonLord/nabber
...
Added Medical Marijuana Packets for the Psychologist
2018-03-13 04:58:04 -07:00
tigercat2000 and GitHub
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
Citinited
e961a8fb86
hitsound for russian revolver, and you can hit people with it
2018-03-08 01:18:37 +00:00
Piccione
3bcc12bd94
Added Weed Packets
2018-03-06 22:22:10 +01:00
shazbot194