deathride58
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
deathride58
3bff5f4cd6
Update PDA_types.dm
2017-12-05 17:43:52 -05:00
Jordan Brown
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
oranges
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
deathride58
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
deathride58
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
deathride58
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05:00
ACCount
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
deathride58
c9211bca16
Update multitool.dm
2017-11-26 21:36:10 -05:00
ACCount
0be326633d
More integrated circuit fixes and code improvements
2017-11-26 04:56:44 -06:00
deathride58
186bcf6ef4
Update laserpointer.dm
2017-11-24 19:03:25 -05:00
Dorsisdwarf
6dea43c709
Advanced Laserpointer Feline Interaction
2017-11-24 17:56:58 -06:00
oranges
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
deathride58
1d4e3612ea
Update PDA.dm
2017-11-22 17:56:49 -05:00
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
oranges
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
Jordie
2bf7b45919
Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
...
Fixes vehicles & chameleon projector
2017-11-19 22:39:14 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
CitadelStationBot
e83b175f30
Merge pull request #3953 from Citadel-Station-13/upstream-merge-32729
...
[MIRROR] removes an unused var from radio code
2017-11-15 11:05:19 -06:00
LetterJay
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
oranges
156aa30c61
Merge pull request #32729 from Qustinnus/cheapGBP
...
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
LetterJay
8868a354b6
Update multitool.dm
2017-11-14 13:06:43 -06:00
arsserpentarium
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
LetterJay
9ff35c5b2c
Merge branch 'master' into upstream-merge-32435
2017-11-13 11:30:06 -06:00
LetterJay
aa020ea9e8
Update electropack.dm
2017-11-12 16:00:15 -06:00
LetterJay
de8e064e45
Update electropack.dm
2017-11-12 15:42:44 -06:00
LetterJay
1c8d9b3a4e
Update electropack.dm
2017-11-12 10:38:30 -06:00
LetterJay
77d261aa8a
Update camera_bug.dm
2017-11-12 10:02:32 -06:00
ACCount
500307b034
Disposal pipes and pipe dispensers refactor
2017-11-12 00:31:00 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
vuonojenmustaturska
355de66eeb
Allows non-humans to be chem scanned via the health analyzer ( #32457 )
2017-11-07 08:02:22 -06:00
XDTM
d04b5cbeef
Ghosts can now Health Scan ( #31640 )
...
* Ghosts can now Health Scan
* cyberbossing
* Update observer.dm
2017-11-02 08:46:42 -05:00
LetterJay
6ba4300f6e
Merge pull request #3696 from Citadel-Station-13/upstream-merge-32212
...
[MIRROR] fixes radios being perma-stuck on when emped
2017-10-31 02:59:32 -04:00
kevinz000
0efaf92b6f
fixes radios being perma-stuck on when emped ( #32212 )
...
* fix radio emps
* woops forgot something!
* Update headset.dm
2017-10-30 14:38:46 -05:00
bgobandit
119129a80c
Adds force to items that really should hurt when hit by ( #32200 )
2017-10-29 18:49:48 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
Mercenaryblue
819244575d
Spooky Spectral Instruments ( #31966 )
...
* [dooting intensifies]
Spectral Instruments added
To be used with Spooky Skeletons.
* Spectral Re-balance
The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.
* Requested Changes
Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.
* Loyalty text fix
* Spooky Trumpets
Removed comment.
Added missing spookiness.
* Spooky Dooting
Major Overhaul.
removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.
* Spooky Dooting
mk2
2017-10-29 07:35:16 -05:00
LetterJay
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
Emmett Gaines
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
MoreRobustThanYou
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
LetterJay
9076721384
Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842
...
[MIRROR] GPS renaming fix
2017-10-19 09:05:18 -04:00
Leo
29e20a55de
Merge pull request #31842 from GunHog/GPS_Name_Fix
...
GPS renaming fix
2017-10-18 07:23:31 -05:00
