Commit Graph

208 Commits

Author SHA1 Message Date
kevinz000
46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604
Made flavor texts into an element datum, appliable to every atom.
2020-03-10 17:26:20 -07:00
Ghom
48ff2f2cec Merge pull request #11349 from monster860/pixel_erp
Pixel shifting for ERP
2020-03-10 18:01:52 +01:00
Ghommie
0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
keronshb
0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
To fixs something?
2020-03-08 17:51:17 -04:00
kevinz000
7115c96f9d Merge branch 'master' into gc_debugging 2020-03-07 15:30:47 -08:00
Ghom
aed0efb117 Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7
mobs now clear LAssailent and movespeed modification on Destroy() (alt name i hate xenobiology)
2020-03-07 11:36:37 +01:00
monster860
c8535275ce In case it wasn't shitcode enough, makes it reset on move 2020-03-06 22:05:56 -05:00
keronshb
228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
monster860
4a108d7a9a fixes oopsie 2020-03-06 04:40:22 -05:00
monster860
86baaf3710 Pixel shifting for ERP 2020-03-06 04:31:46 -05:00
kevinz000
4d9c92c317 Update mob.dm 2020-03-06 01:39:16 -07:00
Ghommie
0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie
e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
kevinz000
9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000
045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000
40c2bdf5ee oh boy 2020-02-25 14:06:12 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie
315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
63c8612ccd Refactoring mob holders into an element. 2020-02-04 01:42:59 +01:00
Seris02
18489e5b65 merge fixes 2020-02-02 11:51:26 +08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Lin
293e6576c8 Merge pull request #10564 from kevinz000/optimization_1
Experimental optimizations
2020-01-29 19:25:13 +00:00
Ghom
d3531aade2 Makes transfer_ckey crash logging less pedant. 2020-01-24 17:06:38 +01:00
kevinz000
bedb42f147 Merge remote-tracking branch 'citadel/master' into optimization_1 2020-01-24 03:41:40 -07:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Seris02
fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
97ded4b27b ok 2020-01-14 18:09:12 -07:00
kevinz000
6ead30eab3 more shit 2020-01-14 17:22:54 -07:00
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
Putnam
e412852c8f Made temp flavor "more" pop up with actual temp flavor 2020-01-12 23:44:49 -08:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000
6e50bb9c03 Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag" 2020-01-05 12:47:24 -08:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
2019-12-28 04:07:03 +00:00
Ghommie
187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
kevinz000
86074ae6b1 lowered to 10 after i struggled to open tickets panel 2019-12-21 14:33:02 -08:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
kevinz000
0feb54bf70 Update mob.dm 2019-12-19 17:54:01 -07:00
kevinz000
2f78c0a5db Update mob.dm 2019-12-19 17:51:23 -07:00