kevinz000
|
c14b1c2857
|
linter
|
2020-03-16 14:18:47 -07:00 |
|
kevinz000
|
9bd275e430
|
Merge remote-tracking branch 'citadel/master' into shield_refactor
|
2020-03-16 13:47:53 -07:00 |
|
kevinz000
|
229b6751ec
|
nerf eshield
|
2020-03-16 13:47:44 -07:00 |
|
kevinz000
|
0692184a0a
|
k
|
2020-03-16 13:34:07 -07:00 |
|
kevinz000
|
1585b34e41
|
Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1
Fixing a couple issues with recyclers.
|
2020-03-16 13:23:46 -07:00 |
|
kevinz000
|
b062c76ca7
|
Merge pull request #11485 from Ghommie/Ghommie-cit625
Fixing a little issue with the musician trait etcetera.
|
2020-03-16 13:23:25 -07:00 |
|
kevinz000
|
2e90761f88
|
Merge pull request #11482 from Ghommie/Ghommie-cit624
fixing missing icon issues for some survival pod machinery.
|
2020-03-16 13:23:06 -07:00 |
|
kevinz000
|
fd7bfaba06
|
Merge pull request #11480 from Ghommie/Ghommie-cit623
Banana pies, beams. runtime errors and warnings.
|
2020-03-16 13:22:49 -07:00 |
|
kevinz000
|
3c97782a87
|
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
mining borg nerfs - "they should be outclassed lategame"
|
2020-03-16 13:22:23 -07:00 |
|
kevinz000
|
70880624e6
|
implement blocktypes
|
2020-03-16 13:20:58 -07:00 |
|
kevinz000
|
ceb3d39266
|
k
|
2020-03-16 12:51:30 -07:00 |
|
kevinz000
|
7a25e04324
|
bet
|
2020-03-16 11:15:11 -07:00 |
|
kevinz000
|
7fdbcc55c6
|
s
|
2020-03-16 11:12:10 -07:00 |
|
kevinz000
|
d3724d5fbd
|
f
|
2020-03-16 10:59:34 -07:00 |
|
kevinz000
|
26ee02ef39
|
dab
|
2020-03-16 10:52:23 -07:00 |
|
kevinz000
|
a929fa1e8d
|
s
|
2020-03-16 10:46:56 -07:00 |
|
kevinz000
|
e3301f8722
|
bet
|
2020-03-16 10:44:02 -07:00 |
|
Seris02
|
ffb2e65c17
|
why I hate byond (#11496)
|
2020-03-16 17:20:51 +01:00 |
|
kevinz000
|
8fdb1e5964
|
Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
|
2020-03-16 06:12:40 -07:00 |
|
Seris02
|
b8e8a81d1c
|
there
|
2020-03-16 20:49:10 +08:00 |
|
kevinz000
|
6af9c54da5
|
better
|
2020-03-16 04:59:55 -07:00 |
|
kevinz000
|
a77be038b8
|
refactoring this whole thing again
|
2020-03-16 04:56:32 -07:00 |
|
kevinz000
|
c35ffacf50
|
k
|
2020-03-16 04:29:18 -07:00 |
|
kevinz000
|
763c835a53
|
bitflags not equals
|
2020-03-16 04:26:19 -07:00 |
|
kevinz000
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -07:00 |
|
kevinz000
|
857f793600
|
ok
|
2020-03-16 04:12:54 -07:00 |
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
kevinz000
|
94db06509c
|
slight desword reflect meme buff
|
2020-03-16 03:50:26 -07:00 |
|
kevinz000
|
d32bff7815
|
return list
|
2020-03-16 03:35:10 -07:00 |
|
kevinz000
|
09e1be9651
|
block args
|
2020-03-16 03:32:12 -07:00 |
|
kevinz000
|
703fca5f90
|
add owner argument
|
2020-03-16 03:24:19 -07:00 |
|
kevinz000
|
5d2fb654e8
|
k
|
2020-03-16 03:23:09 -07:00 |
|
kevinz000
|
9ead492bb0
|
changes
|
2020-03-16 00:28:18 -07:00 |
|
Hatterhat
|
1fe67d5ce9
|
a finger of the monkey's paw curls.
|
2020-03-16 01:35:47 -05:00 |
|
kevinz000
|
fae84f9ee6
|
Merge pull request #11462 from Ghommie/Ghommie-cit621
Fixing some bug reports.
|
2020-03-15 23:03:59 -07:00 |
|
kevinz000
|
f927793118
|
Merge pull request #11474 from kappa-sama/patch-17
halves the firebeath mutation's cooldown to 1 minute from 2 minutes
|
2020-03-15 23:03:10 -07:00 |
|
Seris02
|
259bb03969
|
fixes the swapping of buttons (#11475)
|
2020-03-16 01:57:55 +01:00 |
|
Ghommie
|
5e5bdec85d
|
More runtime errors.
|
2020-03-16 01:55:02 +01:00 |
|
Ghommie
|
8af3d0e2fa
|
Fixing a little issue with the musician trait etcetera.
|
2020-03-16 00:09:03 +01:00 |
|
Ghom
|
2b9f352a14
|
Fixing a couple issues with recyclers.
|
2020-03-15 22:12:55 +01:00 |
|
Hatterhat
|
802d37a399
|
borgs should be outclassed lategame and not hunt
|
2020-03-15 15:55:31 -05:00 |
|
kevinz000
|
339ea13e00
|
Update beam_rifle.dm (#11477)
|
2020-03-15 20:54:23 +01:00 |
|
Ghommie
|
0ce0265420
|
fixing missing icons for survival pod machinery.
|
2020-03-15 20:47:37 +01:00 |
|
Ghom
|
4020c67956
|
Update snacks_pie.dm
|
2020-03-15 16:16:28 +01:00 |
|
Ghommie
|
b453a25e14
|
Something about banana pies, runtime errors and warnings.
|
2020-03-15 15:41:32 +01:00 |
|
Ghommie
|
5bfbcd0948
|
Fixing some GetElement runtimes.
|
2020-03-15 15:12:35 +01:00 |
|
kevinz000
|
b7c3ada3e5
|
nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438)
* Update status_procs.dm
* Update status_procs.dm
* travis
* aight bet
|
2020-03-15 13:08:52 +01:00 |
|
Ghom
|
d8a6e9b94f
|
Merge branch 'master' into Ghommie-cit621
|
2020-03-15 13:07:45 +01:00 |
|
kevinz000
|
2139bfdb5f
|
Merge pull request #11290 from Putnam3145/traitor-types
Traitor classes: a new paradigm.
|
2020-03-15 01:35:30 -07:00 |
|