Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
kevinz000
|
603ab65ed1
|
Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
|
2020-01-25 19:33:26 -07:00 |
|
kevinz000
|
2acb52fb56
|
Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
|
2020-01-25 05:54:35 -07:00 |
|
kevinz000
|
ac6695bd68
|
Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
|
2020-01-24 16:15:44 -07:00 |
|
Ghommie
|
6fe0c57c42
|
run-extra-times fixes.
|
2020-01-24 20:48:32 +01:00 |
|
Ghom
|
d5daae98c7
|
Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
|
2020-01-24 18:46:25 +01:00 |
|
kevinz000
|
928a8ceea3
|
Merge pull request #10628 from Citadel-Station-13/Ghommie-patch-1
Quick rubber toolbox materials fix.
|
2020-01-24 00:26:22 -07:00 |
|
kevinz000
|
7cd6490e86
|
Merge pull request #10526 from Seris02/bowmanupgrade
allows headsets to be bowmanized and adds a traitor item for that
|
2020-01-24 00:21:34 -07:00 |
|
kevinz000
|
07277436ac
|
Merge pull request #10665 from Ghommie/Ghommie-cit513
Fixes chainsaw force being set to 0 on drop.
|
2020-01-24 00:20:26 -07:00 |
|
kevinz000
|
2a706ceb05
|
Merge pull request #10664 from kappa-sama/patch-17
makes cursed dragnet take 5 seconds instead of 30 to break out of
|
2020-01-24 00:18:05 -07:00 |
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +08:00 |
|
Ghommie
|
7d5725e450
|
a dot
|
2020-01-24 02:31:46 +01:00 |
|
Ghommie
|
78934c52fe
|
A handful of runtime fixes.
|
2020-01-24 02:27:06 +01:00 |
|
Ghommie
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|
Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
kevinz000
|
4304a7dd42
|
Merge pull request #10602 from Ghommie/Ghommie-cit509
RPD ventcrawler escapism sanity check.
|
2020-01-23 04:47:46 -07:00 |
|
kevinz000
|
1b7265d8c1
|
Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
|
2020-01-23 04:46:52 -07:00 |
|
kevinz000
|
88f625edfc
|
Merge pull request #10636 from Ghommie/Ghommie-cit512
Trilby's solar panels PR but improved.
|
2020-01-23 04:35:13 -07:00 |
|
Seris02
|
934c8fe533
|
updates + thingamajig
|
2020-01-23 15:25:45 +08:00 |
|
Ghommie
|
b0da18e404
|
Fixes chainsaw force being set to 0 on unwield.
|
2020-01-23 02:13:55 +01:00 |
|
kappa-sama
|
c8cfd4e150
|
cursed
|
2020-01-22 16:52:28 -05:00 |
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08:00 |
|
Seris02
|
c2bcbe868e
|
merge conflicts + getting rid of commented code for now
|
2020-01-21 11:23:33 +08:00 |
|
Ghom
|
c244f95ed9
|
Merge pull request #10588 from PersianXerxes/tweakEngieField
Reduces Forcefield Projector Range to Two Tiles
|
2020-01-21 02:17:38 +01:00 |
|
kevinz000
|
5abc1104c0
|
ok
|
2020-01-20 18:03:54 -07:00 |
|
kevinz000
|
221e05b3c8
|
add line
|
2020-01-20 17:58:58 -07:00 |
|
kevinz000
|
bb14b255d2
|
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12
|
2020-01-20 17:51:56 -07:00 |
|
Ghommie
|
c93f16e4d4
|
Unused variable.
|
2020-01-21 00:45:51 +01:00 |
|
Ghommie
|
ddf037da92
|
Trilby's solar panels PR but improved.
|
2020-01-21 00:28:41 +01:00 |
|
kevinz000
|
0661bc2558
|
Update PDA.dm
|
2020-01-20 15:26:24 -07:00 |
|
Ghommie
|
5644617786
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
|
2020-01-20 20:59:38 +01:00 |
|
Ghom
|
4c6af66050
|
Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16
Grenades can now actually have their timers adjusted
|
2020-01-20 20:02:06 +01:00 |
|
Ghom
|
5bc7229a9f
|
Quick rubber toolbox materials fix.
|
2020-01-20 19:11:43 +01:00 |
|
kevinz000
|
051ca8c050
|
checks
|
2020-01-20 03:45:40 -07:00 |
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
kevinz000
|
ecddef2f21
|
compile
|
2020-01-19 22:58:08 -07:00 |
|
kevinz000
|
0b10b8cf89
|
Update code/game/objects/items/devices/PDA/PDA.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-19 22:41:19 -07:00 |
|
Seris02
|
5524b0fa03
|
yes.
|
2020-01-20 13:00:24 +08:00 |
|
Seris02
|
8da447c678
|
start of stealthmode
|
2020-01-20 09:51:17 +08:00 |
|
kevinz000
|
b1cd0f4ede
|
Update grenade.dm
|
2020-01-19 16:11:49 -07:00 |
|
kevinz000
|
088e586b47
|
Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2020-01-19 16:10:56 -07:00 |
|
kevinz000
|
374f4f143e
|
Update PDA.dm
|
2020-01-19 13:45:16 -07:00 |
|
kevinz000
|
90fcedd188
|
Update grenade.dm
|
2020-01-19 13:40:09 -07:00 |
|
Ghom
|
536900a7ac
|
Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
|
2020-01-19 16:37:40 +01:00 |
|
Seris02
|
45b844c231
|
more fixes + code improvements
|
2020-01-19 16:48:19 +08:00 |
|
Seris02
|
afe7c15645
|
merge fixes
|
2020-01-19 16:40:45 +08:00 |
|
Seris02
|
fd49c1302b
|
woops
|
2020-01-19 15:55:24 +08:00 |
|
Seris02
|
47d1f46172
|
fixes and stuff
|
2020-01-19 15:53:32 +08:00 |
|
Seris02
|
f54417f99e
|
fixes
|
2020-01-19 15:50:48 +08:00 |
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|