deathride58
|
c76cacdf77
|
Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914
[MIRROR] [READY]NTnet refactor, assimilates exonet
|
2017-11-23 01:40:54 +00:00 |
|
deathride58
|
435ac739fc
|
Update machine_circuitboards.dm
|
2017-11-22 20:09:18 -05: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 |
|
oranges
|
c2c22d56c7
|
[READY]NTnet refactor, assimilates exonet
|
2017-11-22 15:52:54 -06:00 |
|
deathride58
|
d86bdf2150
|
Update trash.dm
|
2017-11-22 14:44:09 -05:00 |
|
ShizCalev
|
6ab499b57b
|
Fixes bartender suit having an adjust state
|
2017-11-22 12:40:32 -06:00 |
|
deathride58
|
51a7c4a543
|
Merge pull request #4057 from deathride58/manualmirrors2
Manually mirrors #32838 and #32462 from upstream
|
2017-11-21 20:00:18 +00:00 |
|
deathride58
|
1f6b3ce629
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-21 19:53:58 +00:00 |
|
deathride58
|
ddbb5c34d4
|
manual mirrors
|
2017-11-21 14:06:28 -05:00 |
|
ACCount
|
8a64287249
|
Integrated circuit fixes and code improvements
|
2017-11-21 03:04:17 -06:00 |
|
deathride58
|
4e727ee576
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-32860
# Conflicts:
# _maps/map_files/MetaStation/MetaStation.dmm
|
2017-11-20 23:34:46 -05: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 |
|
deathride58
|
8249c89cc0
|
Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905
[MIRROR] Adds AI lawset spawners (mapping helpers)
|
2017-11-21 03:25:55 +00:00 |
|
WJohn
|
e8ddae5d98
|
Cleans up floors.dmi a bit and adds new turf decals.
|
2017-11-20 20:48:06 -06:00 |
|
deathride58
|
a5ed407bc5
|
Merge pull request #4034 from Citadel-Station-13/upstream-merge-32890
[MIRROR] Makes drinking glasses smash when thrown
|
2017-11-20 19:07:25 +00:00 |
|
deathride58
|
588b76b59e
|
Update lootdrop.dm
|
2017-11-20 13:57:15 -05:00 |
|
Jordan Brown
|
2498e1ddc0
|
Cleans up unused code
|
2017-11-20 10:14:32 -06:00 |
|
Jordan Brown
|
212071e075
|
Adds AI lawset spawners (mapping helpers)
|
2017-11-20 10:12:17 -06:00 |
|
ShizCalev
|
831dde525e
|
Makes drinking glasses smash when thrown
|
2017-11-20 02:45:22 -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 |
|
deathride58
|
994b55c523
|
Merge pull request #4027 from Citadel-Station-13/upstream-merge-32864
[MIRROR] Fixes some computer dirs
|
2017-11-20 05:09:43 +00:00 |
|
deathride58
|
dccd2b6744
|
Merge pull request #4026 from Citadel-Station-13/upstream-merge-32880
[MIRROR] Fixes vehicles & chameleon projector
|
2017-11-20 05:09:08 +00:00 |
|
Jordie
|
571985ca5d
|
Merge pull request #32864 from ike709/dir
Fixes some computer dirs
|
2017-11-19 22:42:28 -06:00 |
|
Jordie
|
2bf7b45919
|
Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
Fixes vehicles & chameleon projector
|
2017-11-19 22:39:14 -06:00 |
|
Jordie
|
752bc654ae
|
Makes some turning procs consistently turn clockwise
|
2017-11-19 22:25:17 -06:00 |
|
oranges
|
326c87904a
|
Merge pull request #32876 from vuonojenmustaturska/glowshrooms
Actually fixes the glowshroom runtime
|
2017-11-19 21:24:51 -06:00 |
|
deathride58
|
1d841ce65a
|
Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736
[MIRROR] RPD ui improvements
|
2017-11-18 05:40:13 +00:00 |
|
deathride58
|
eeba86e27e
|
Merge branch 'master' into upstream-merge-32188
|
2017-11-18 05:31:42 +00:00 |
|
deathride58
|
9e78bcd8f9
|
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
|
2017-11-18 05:29:32 +00:00 |
|
deathride58
|
38f7b829c3
|
Update manifest.dm
|
2017-11-17 23:20:44 -05:00 |
|
duncathan salt
|
52fc5e8bc6
|
RPD ui improvements
|
2017-11-17 18:03:56 -06:00 |
|
oranges
|
a637da3b0f
|
Add the ability to osay from the viewvar dropdown (#32804)
|
2017-11-17 03:49:08 -06:00 |
|
CitadelStationBot
|
fd12953f10
|
[MIRROR] New -> Initialize (#3972)
* New -> Initialize (#32777)
* New -> Initialize
* Remove loc from Initialize
* New -> Initialize
|
2017-11-17 00:24:02 -08: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 |
|
vuonojenmustaturska
|
6ce69fb2c8
|
Replaces a bunch of mob loops with hopefully better ones
|
2017-11-16 16:09:15 -06:00 |
|
deathride58
|
f6e4e77b80
|
Merge pull request #3962 from Citadel-Station-13/upstream-merge-32743
[MIRROR] Fixes pipe dispensers being unable to dispense bent pipes
|
2017-11-16 17:26:18 +00:00 |
|
ACCount
|
1b9280776e
|
Fixes pipe dispensers being unable to dispense bent pipes (#32743)
* Fixes pipe dispensers not dispensing bent pipes
* Updates meter RPD icon file to the one that's actually used
|
2017-11-15 19:12:34 -06:00 |
|
AutomaticFrenzy
|
cb7d45c980
|
actually use disable_warning mob_can_equip (#32750)
|
2017-11-15 19:07:01 -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 |
|
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
|
f45006ef57
|
Merge pull request #3947 from Citadel-Station-13/upstream-merge-32719
[MIRROR] Fixes a runtime with glowshrooms
|
2017-11-15 10:41:41 -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 |
|
LetterJay
|
16019df886
|
Merge branch 'master' into upstream-merge-32280
|
2017-11-15 10:21:04 -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 |
|
Matt Smith
|
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 |
|
LetterJay
|
809951c56c
|
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
[MIRROR] loc -- > forcemove
|
2017-11-14 15:58:20 -06:00 |
|
LetterJay
|
62c7cfc4e7
|
Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689
[MIRROR] Fixes a bunch of hand tele/portal issues.
|
2017-11-14 15:56:08 -06:00 |
|
MoreRobustThanYou
|
a970bc2283
|
Fixes a runtime with glowshrooms (#32719)
|
2017-11-14 15:36:53 -06:00 |
|