435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
d9ca1d6831
Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224
...
[MIRROR] Plasma statues get fixed
2017-12-03 23:30:01 +00:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
a575e2668d
Plasma statues get fixed ( #33224 )
...
* Plasma statues fix
* Actually a fix
* brackets
2017-12-03 13:16:45 -06:00
8017aac116
Fixes spelling error in opened cryogenic pods. ( #33189 )
2017-12-02 09:45:07 -06:00
32f694943b
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
...
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
48c66093fc
Fixes big band music crate ( #33138 )
2017-11-28 19:02:54 -06:00
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
237f0fa8db
Lowers rack layer to 2.8 ( #33069 )
2017-11-25 09:21:02 -06:00
12aa356f10
Updates some item drops to use drop_location()
2017-11-24 12:59:33 -06:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
6ab499b57b
Fixes bartender suit having an adjust state
2017-11-22 12:40:32 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
5560a557e7
Refactor ladders so that they actually work ( #32797 )
2017-11-20 02:05:52 -06:00
44287392a4
Merge pull request #4022 from Citadel-Station-13/upstream-merge-32889
...
[MIRROR] Makes some turning procs consistently turn clockwise
2017-11-20 05:48:20 +00:00
571985ca5d
Merge pull request #32864 from ike709/dir
...
Fixes some computer dirs
2017-11-19 22:42:28 -06:00
752bc654ae
Makes some turning procs consistently turn clockwise
2017-11-19 22:25:17 -06:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
df514d7411
Makes you turn when pulling and adds sound to rolling bed and chair ( #32778 )
...
* Makes you turn at what you are pulling and adds sound to rolling bed and chair
* ShizCalev's sound
2017-11-16 18:44:05 -06:00
607294a2b6
Merge pull request #3952 from Citadel-Station-13/upstream-merge-32630
...
[MIRROR] Alternative grille sprite update
2017-11-15 11:02:04 -06:00
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
c4789d497a
Alternative grille sprite update ( #32630 )
...
* Update grille sprite
* Add damaged grille sprite
* Add 4 varients to the damaged grille
2017-11-14 23:55:25 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
648477ebe1
Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637
...
[MIRROR] Adds a timer to falsewall code
2017-11-13 11:53:08 -06:00
a0f70c9364
Adds a timer to falsewall code ( #32637 )
...
* Adds a timer to falsewall code
* better code
* removes a parameter
2017-11-13 03:29:21 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
73cb2ead88
Items no longer need to check for tools in attackby
2017-11-11 14:31:12 -06:00
248d63fa3a
Makes editing movements delay configs have an effect again ( #32530 )
2017-11-09 11:06:03 -06:00
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
3f1d478c27
Merge pull request #3795 from Michiyamenotehifunana/secskirt
...
Security Skirts and more!
2017-11-04 22:49:14 -05:00
6446b7f126
Security Skirts and more!
2017-11-04 10:22:45 +08:00
bd42e162c5
Fixes golem shells breaking spawners menu ( #32342 )
2017-11-03 17:37:20 -05:00
67a91aaf41
Hotel Security spellchecked ( #32313 )
...
* spellcheck
interests
* spellcheck
2017-11-02 13:29:15 -05:00
cfaa6a9cd5
Reflector fixes and improvements
2017-10-31 21:01:45 -05:00
761acb5084
Merge pull request #3706 from Citadel-Station-13/upstream-merge-32134
...
[MIRROR] Makes rollerbeds normal-sized items
2017-10-31 03:02:43 -04:00
f6ebb15fbd
Merge pull request #32134 from Anonmare/patch-8
...
Makes rollerbeds normal-sized items
2017-10-30 15:09:49 -05:00
b6343c813b
Merge pull request #32215 from kevinz000/patch-363
...
fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
2017-10-30 14:37:37 -05:00
d0a28fcd62
NERF EVERYTHING
...
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
1fe4eb7d88
Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns
...
Recolorable Guns and more ballistics for Security
2017-10-29 23:43:20 -04:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
f900f2ea9a
Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
...
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
28053a603a
Merge pull request #31991 from ShizCalev/reflector-stack-fix
...
fixes reflectors dropping extra mats
2017-10-26 05:03:48 -05:00
ACCount