qweq12yt
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
The0bserver
f1109c4f67
what a crate day (initial commit)
2021-05-01 02:15:07 -04:00
qweq12yt
7ca46715d7
Merge branch 'master' into cargo-bugfixes
2021-04-08 19:15:55 -03:00
SandPoot
29bf226fe1
upload closets.dm
2021-04-06 18:18:08 -03:00
SandPoot
2381db5f53
upload files
2021-03-31 12:35:43 -03:00
qweq12yt
04f90b749f
fixes material crates not shipping
2021-03-30 12:33:23 -03:00
Lin
715f86ef5c
Merge pull request #14447 from LetterN/fixes-2
...
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
Lin
4e641eedb9
Merge pull request #14489 from LetterN/amogus
...
Fixes NIRM
2021-03-22 15:37:56 -05:00
LetterN
760a7de229
Merge remote-tracking branch 'origin/master' into fixes-2
2021-03-22 09:32:21 +08:00
LetterN
86b8bbf727
no more free shipping
2021-03-21 21:44:04 +08:00
silicons
d434f60cb3
Update closets.dm
2021-03-18 16:59:03 -07:00
LetterN
228105b391
laptop and closet decon fix
2021-03-16 14:47:28 +08:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
silicons
1df2257e61
Merge pull request #14052 from SiliconMain/baitbegone
...
Update engineering.dm
2021-01-13 22:43:01 -07:00
SiliconMain
cccb547a72
Update engineering.dm
2021-01-13 23:41:49 -06:00
silicons
bcb2e16cef
Merge pull request #14035 from SiliconMain/baitbegone
...
Comments out hololocks
2021-01-13 16:53:01 -07:00
SiliconMain
2d3e24fee4
Update engineering.dm
2021-01-12 14:43:54 -06:00
MrJWhit
abffac67b2
Port'n
2021-01-06 03:16:08 -05:00
silicons
da25c48b2c
Merge pull request #13855 from Chiirno/paramedBoxOffice
...
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
silicons
bff30f587b
sigh
2020-12-23 09:16:16 -07:00
Chiirno
35896e92ec
Paramedic office added and operating room remodeled
2020-12-22 21:50:22 -04:00
shellspeed1
3735efbfca
Ports construction bags
2020-11-29 18:29:03 -08:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
Detective Google
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
Detective Google
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
Timothy Teakettle
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
Letter N
116145872f
commit thing, need to see changies but gitlens is denying me
2020-08-29 14:00:46 +08:00
Letter N
f04918bdca
working code?
2020-08-21 15:09:49 +08:00
ancientpower
99d73388f8
lets ghosts see the contents of closets
2020-08-11 16:40:03 -05:00
Lin
447a0b24bf
Merge pull request #12944 from timothyteakettle/fixes-crates
...
fixes some crafted crates containing items
2020-07-28 22:11:30 -05:00
Timothy Teakettle
dc14c02570
fix crates
2020-07-27 21:55:51 +01:00
silicons
9c9014acdb
crate fix
2020-07-23 16:19:07 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
silicons
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
silicons
1a040dd2a6
changes
2020-07-18 18:44:17 -07:00
silicons
7c5d4f863d
click cd breakout
2020-07-18 18:10:21 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Ghommie
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
Ghommie
495ccc99c5
Porting some cargo/vending updates.
2020-06-08 06:12:51 +02:00
Ghommie
1a9484cf2e
Fixing missing clothing icons etc.
2020-06-02 17:43:31 +02:00
Ghommie
9a9e76664f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 22:47:13 +02:00
Chayse Ramsay
f95222fee0
For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. ( #12155 )
...
* HoS modular revolver, ported from vore
* Bugfixing, sanity checks etc.
* Update hos.dm
* Sprite fixed
* Automatic changelog compile [ci skip]
* HoS Weapon Selection
* Icons
* Clamp fix, removing rogue items from ye olde list
* Update ammo.dmi
* Requested Changes Part 1
* Beacon fixed (kind of)
* Subtypes fix
* User
* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty
* redundant item
* Adds an examine notice on how to remove the magazine
* Requested Changes
* Icons
Co-authored-by: Changelogs <action@github.com >
2020-05-30 03:17:56 +02:00
Ghommie
a84e7bcecc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-24 04:00:51 +02:00
Ghom
08280a853e
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' ( #12282 )
...
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'
* Ok, signals.
2020-05-17 17:04:15 -07:00
Ghommie
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
Ghom
7c7147cb3e
Field of Vision component. ( #12075 )
...
* Hopeless WIP for vision cones.
* Core component and hooks done
* Removing clutter.
* linter bashing me for using statements as args.
* Ok.
* continue
* bring back the macro
* Configs and openspace filter.
* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.
* view, viewers and spoopy ghosts.
* Renamed component, admin fun button and snowflakes robots.
* Whoopsie.
* Yikes
* test merge tweak.
* radial yaketi sax.
* Fixed tgui UIs, some messages not displayed to the target.
* Documentation and a little bugfix.
* Pulling QoL, seventh plane made in this PR.
* Fix.
* Tweaks and improvements.
* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
Ghommie
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
ZeroMan
18eb42315e
i missed a src
2020-04-28 02:55:25 -04:00
