267186a5d3
Merge pull request #12646 from Chiirno/emi
...
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
20245f7319
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-30 02:30:29 +03:00
9dc4b99620
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
c5cbfa64e5
Porting further material datum features and improvements.
2020-06-24 20:45:17 +02:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
1bca74465f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-30 03:29:02 +02:00
16dea7ceed
Revamped the paper wizard robes. ( #12348 )
...
* Better paper wizard robes.
* return value.
* ooo
* Aaa
* aaaa
2020-05-27 18:01:22 -07:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
ad57647e64
Merge pull request #12173 from kevinz000/projectiles_2
...
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
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
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
7337993d8e
Lavaland Gear Tweaks - Armor balancing ( #12270 )
...
* lava land tweaks
* Reverts Exo suit touches
5% isnt worth that much, so might as well give it back
* Update miscellaneous.dm
* Reverts the ERT based gear
2020-05-20 18:47:30 -07:00
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
6d6239a8b4
kay
2020-05-08 22:59:51 -07:00
24da94720b
cold res
2020-05-08 11:51:24 -05:00
c79ece7449
really surprised this wasn't done earlier
2020-05-04 18:30:27 +02:00
202b517fa0
Fixing more issues.
2020-05-02 02:05:56 +02:00
5d53ead547
Fucky wucky gateway and ccslab
2020-04-27 10:43:08 +03:00
8440b48a9a
organ/on_life tweaks.
2020-04-25 16:19:43 +02:00
5d01e05991
Merge pull request #11618 from Arturlang/Garlic
...
Adds garlic, and tweaks bloodsuckers a bunch.
2020-04-14 12:38:34 +02:00
b10c479d16
Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3
...
Gives a cooldown to the crusher's vortex talisman trophy.
2020-04-14 01:37:36 -07:00
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
2bf6d888bd
Ports "Obliterates item_color: new washing machine functionality edition"
2020-03-30 18:31:26 +02:00
a5b158301b
Update kinetic_crusher.dm
2020-03-28 03:11:56 +01:00
4c4b1b340b
might as well fix the regen core name and a few tweaks.
2020-03-25 20:24:54 +02:00
9bb7529a49
Progress
2020-03-24 16:55:46 +02:00
c6a8515297
Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic
2020-03-24 12:36:21 +02:00
ba972cf0eb
Argh
2020-03-18 22:41:21 +02:00
0ce0265420
fixing missing icons for survival pod machinery.
2020-03-15 20:47:37 +01:00
2b4b626fac
support for items that switch states through update_icon.
2020-03-10 16:55:30 +01:00
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
9420424c8f
Merge pull request #11332 from Ghommie/Ghommie-cit603
...
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
bb7bfc04cc
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-05 01:47:04 +01:00
74d6473c3b
Initial Commit
...
Changes isvamp() to isbloodsucker(), adds a isvampire() check for the race itself, reworks regen cores codewise, adds a defib check for bloodsuckers
2020-02-25 17:07:40 +02:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
33931da018
Merge pull request #11013 from r4d6/pickaxe
...
Add two more pickaxes, Titanium & Plasteel
2020-02-14 19:34:01 +01:00
8b68e57de0
Add the pickaxes
2020-02-10 22:02:39 -05:00
01390fa0e0
Merge remote-tracking branch 'citadel/master' into attack_chain
2020-02-10 04:18:02 -07:00
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
8de11845d5
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
silicons