LetterJay
b260704381
Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705
...
[MIRROR] Turns the baseturf var into a part time list
2017-12-30 13:19:00 -06:00
Jordan Brown
d38a4a2aa5
Merge pull request #33905 from ShizCalev/jumpsuit-fix
...
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
2017-12-29 10:10:30 -06:00
LetterJay
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
coiax
dc6b4e2b61
Christmas event changes ( #33861 )
...
* A christmas tree with presents is now a subtype
Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.
Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.
* Code review I
* Gaia's Landing: The PR
2017-12-29 00:28:02 -06:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
LetterJay
134201d185
Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433
...
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-25 21:26:17 -06:00
Emmett Gaines
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
oranges
a89435ac33
Merge pull request #32433 from kevinz000/vector_projectiles
...
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-21 19:33:42 -06:00
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
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -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
