LetterJay
|
ac5503d338
|
Merge branch 'master' into upstream-merge-33055
|
2017-12-25 04:10:34 -06:00 |
|
deathride58
|
4d08f9b0bc
|
Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
|
2017-12-21 03:47:50 +00:00 |
|
LetterJay
|
408182758f
|
Merge branch 'master' into upstream-merge-33498
|
2017-12-19 17:50:11 -06:00 |
|
Shadowlight213
|
ffb04fd070
|
Removes syndicate door access from Captain's PDA cartridge. (#33635)
|
2017-12-18 21:22:21 -06:00 |
|
XDTM
|
3af0aa2489
|
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
|
2017-12-18 15:19:53 -06:00 |
|
LetterJay
|
bd1c186111
|
Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
|
2017-12-17 21:26:08 -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 |
|
Ashe Higgs
|
2aef00daf0
|
All-In-One grinder results are now defined by type, not by huge lists
|
2017-12-14 15:48:39 -06:00 |
|
vuonojenmustaturska
|
fcceb5ec77
|
Finishes the forceMove port
|
2017-12-14 15:40:08 -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 |
|
deathride58
|
6e6b85c01a
|
Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276
[MIRROR] Restores the uplink modules, removes LoadComponents
|
2017-12-10 23:49:25 +00:00 |
|
deathride58
|
7179547be4
|
Merge branch 'master' into upstream-merge-31727
|
2017-12-10 21:51:51 +00:00 |
|
oranges
|
d88bff9fa9
|
Restores the uplink modules, removes LoadComponents
|
2017-12-10 14:14:37 -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 |
|
XDTM
|
988dbe87da
|
Brain Traumas
|
2017-12-06 12:05:20 -06: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 |
|