LetterJay
|
f29a3f89d0
|
Merge pull request #4421 from Citadel-Station-13/upstream-merge-33591
[MIRROR] fixes magic mirrors letting you be robustin zombies
|
2017-12-21 05:01:50 -06:00 |
|
LetterJay
|
3973b368de
|
Merge branch 'master' into upstream-merge-33470
|
2017-12-21 03:24:03 -06:00 |
|
LetterJay
|
408182758f
|
Merge branch 'master' into upstream-merge-33498
|
2017-12-19 17:50:11 -06:00 |
|
LetterJay
|
a8db6dc9c2
|
Update mop_bucket.dm
|
2017-12-19 15:29:36 -06:00 |
|
ACCount
|
522b8383d8
|
[READY]Refactors reagent container types
|
2017-12-18 22:54:51 -06:00 |
|
LetterJay
|
3895eb9eac
|
Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
[MIRROR] Finishes the forceMove port
|
2017-12-17 20:28:07 -06:00 |
|
Evsey Antonovich
|
3b1c537bb4
|
changes one letter (#33591)
|
2017-12-17 11:30:37 -06:00 |
|
Emmett Gaines
|
f875d4e176
|
Defines math, take 2
|
2017-12-17 10:02:43 -06:00 |
|
LetterJay
|
7af461539f
|
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
|
2017-12-16 13:08:50 -06:00 |
|
kevinz000
|
253c819bc1
|
TG Sync 12/15/17
s
s
|
2017-12-15 06:27:57 -08:00 |
|
nicbn
|
6f9ecf2f32
|
New closet sprites (#33207)
They're new sprites deal with it
|
2017-12-14 15:49:49 -06:00 |
|
vuonojenmustaturska
|
fcceb5ec77
|
Finishes the forceMove port
|
2017-12-14 15:40:08 -06:00 |
|
deathride58
|
bd2010eabb
|
Update bins.dm
|
2017-12-13 16:46:18 -05:00 |
|
vuonojenmustaturska
|
7f90427a40
|
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
|
2017-12-13 13:56:57 -06:00 |
|
Mark9013100
|
a68b5bd3cb
|
Adds extra labcoats to medical wardrobe (#33467)
|
2017-12-12 14:27:22 -06:00 |
|
CitadelStationBot
|
cc0b768c72
|
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
|
2017-12-11 16:36:38 -08:00 |
|
uraniummeltdown
|
d6b0683846
|
Airlock Construction Update
|
2017-12-10 15:23:34 -06:00 |
|
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
|
0c8bdab295
|
Merge pull request #4279 from Citadel-Station-13/upstream-merge-33357
[MIRROR] Prevents (cat)grilles from magically regenerating.
|
2017-12-08 19:06:46 +00:00 |
|
deathride58
|
53ab4feb2f
|
Merge pull request #4270 from Citadel-Station-13/upstream-merge-33324
[MIRROR] [Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
|
2017-12-08 18:47:56 +00:00 |
|
Dax Dupont
|
513a15f463
|
Prevents grilles from magically regenerating (#33357)
|
2017-12-08 12:24:12 -06:00 |
|
deathride58
|
bc4b689d56
|
Update medical.dm
|
2017-12-08 12:23:03 -05:00 |
|
Jordan Brown
|
8b9e15d1b5
|
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
|
2017-12-08 10:35:23 -06:00 |
|
Ashe Higgs
|
315e1d718a
|
Adds pet carriers
|
2017-12-08 10:34:05 -06:00 |
|
ACCount
|
435e46e407
|
Moves some machine sprites into /machines/ folder
|
2017-12-05 03:24:03 -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
|
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 |
|
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 |
|
Robustin
|
a575e2668d
|
Plasma statues get fixed (#33224)
* Plasma statues fix
* Actually a fix
* brackets
|
2017-12-03 13:16:45 -06:00 |
|
BeeSting12
|
8017aac116
|
Fixes spelling error in opened cryogenic pods. (#33189)
|
2017-12-02 09:45:07 -06:00 |
|
deathride58
|
32f694943b
|
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
[MIRROR] Removes mass-spectrometers
|
2017-11-30 04:45:13 +00:00 |
|
ShizCalev
|
48c66093fc
|
Fixes big band music crate (#33138)
|
2017-11-28 19:02:54 -06:00 |
|
ACCount
|
f089b9ca2d
|
Removes mass-spectrometers
|
2017-11-28 06:27:55 -06:00 |
|
WJohn
|
237f0fa8db
|
Lowers rack layer to 2.8 (#33069)
|
2017-11-25 09:21:02 -06:00 |
|
ShizCalev
|
12aa356f10
|
Updates some item drops to use drop_location()
|
2017-11-24 12:59:33 -06:00 |
|
LetterJay
|
eba36e48f9
|
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
|
2017-11-22 18:42:34 -06:00 |
|
deathride58
|
b6630b41d1
|
merges #3877 proper
|
2017-11-22 17:37:22 -05:00 |
|
ShizCalev
|
6ab499b57b
|
Fixes bartender suit having an adjust state
|
2017-11-22 12:40:32 -06:00 |
|
deathride58
|
1f6b3ce629
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-21 19:53:58 +00:00 |
|
deathride58
|
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 |
|
Jordan Brown
|
2498e1ddc0
|
Cleans up unused code
|
2017-11-20 10:14:32 -06:00 |
|
Tad Hardesty
|
5560a557e7
|
Refactor ladders so that they actually work (#32797)
|
2017-11-20 02:05:52 -06:00 |
|
deathride58
|
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 |
|
Jordie
|
571985ca5d
|
Merge pull request #32864 from ike709/dir
Fixes some computer dirs
|
2017-11-19 22:42:28 -06:00 |
|
Jordie
|
752bc654ae
|
Makes some turning procs consistently turn clockwise
|
2017-11-19 22:25:17 -06:00 |
|
Jordie
|
b7e99a7448
|
JSON feedback
|
2017-11-17 01:44:12 -06:00 |
|
nicbn
|
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 |
|
CitadelStationBot
|
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 |
|
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 |
|