18bdb753d3
bet
2020-03-03 21:13:59 -07:00
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -07:00
6354b48659
fix
2020-03-03 20:58:06 -07:00
b6431b0ef6
changes
2020-03-03 20:54:53 -07:00
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
97733e464d
ghommie change and armrest bug fix
2020-03-04 01:35:00 +00:00
a452cfb31b
ouch
2020-03-03 22:26:56 +01:00
9aa712d84b
Fixes and improves RCL sprite update procs.
2020-03-03 22:19:12 +01:00
62eef87835
Merge pull request #11289 from Trilbyspaceclone/patch-301
...
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
86790c69a5
credits accidently left out previously
...
re-adds nod to CEV Eris for their original sprites.
2020-03-03 14:38:16 +00:00
7e0abda3c1
fixing merge conflicts
...
includes trillby's new posters.
2020-03-03 13:56:01 +00:00
83ec1e428c
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
2020-03-03 13:48:18 +00:00
fe7742637f
fixing merge conflicts aaahh
2020-03-03 13:47:58 +00:00
d32b6ad7e9
ok
2020-03-03 08:47:17 -05:00
a240daaca2
Final changes
...
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
2020-03-03 13:19:15 +00:00
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
c21bd60929
fix
2020-03-03 03:04:23 -07:00
4315a4d1b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 23:06:29 +01:00
c984cd7677
Merge pull request #11270 from ancientpower/paramedic-tweaks
...
Paramedic tweaks (sprites/access/stuff for future use)
2020-03-02 22:46:49 +01:00
f08d79767b
Removes makeshift switchblades
2020-03-02 19:33:31 +01:00
50a1feeb89
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 17:38:08 +01:00
e1f3985309
Update musician.dm
2020-03-02 05:33:48 -07:00
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
41e4de9287
fixes telebatons runtiming and not being able to be extended
2020-03-02 02:47:21 +01:00
508511cb86
actually makes contractor pinpointer do things
2020-03-02 01:36:11 +01:00
7206e5ee6e
nearly forgot these as well
2020-03-01 23:31:14 +01:00
efaa99ae27
some dozens lines about PDA/update_overlays and cryopods/MMIs.
2020-03-01 23:17:35 +01:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
d817442f02
It works!
...
Everything works now.
2020-03-01 13:42:14 +00:00
72d3572ec3
New sofas added, need to be added to sheet_types.dm still
...
Backing up the .dmi changes and two comfy chairs.
2020-03-01 11:58:59 +00:00
71c26c287e
Update sheet_types.dm
2020-03-01 01:55:03 -05:00
5c2bf70fe7
Update code/game/objects/items/shields.dm
...
Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com >
2020-03-01 00:48:45 -05:00
12ea1132c4
Apply suggestions from code review
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-01 00:43:34 -05:00
dd36688e9a
Update watercloset.dm
2020-02-29 03:31:42 -05:00
612f8d97d5
Update sheet_types.dm
2020-02-29 03:29:08 -05:00
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
5ee4a355c1
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
...
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
ba55351e4a
Update twohanded.dm
2020-02-28 13:43:11 -07:00
93d91b1808
Merge remote-tracking branch 'citadel/master' into sword_point
2020-02-28 13:39:56 -07:00
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
045d5b2dbf
fixes
2020-02-27 20:06:52 -07:00
kevinz000