Commit Graph

24553 Commits

Author SHA1 Message Date
Yawet330 8e26876634 Makes Spears rational. (#12401)
* hate spears, hate elances, hate embedding.

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/game/objects/items/twohanded.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-01 01:44:31 +02:00
Letter N 1fc73700c5 Telecomms TGUI (#12145)
* aaaaaa

* branch hell

* time to sync

* build

* adds more """functionality""" for telemonitor

* messaging pda thing

* bakes tgui

* someone didn't finish the code for req. consoles

* go use [TELECOMM STUFF].on, it's better

* build stuff

* a

* interface for teleinteraction

* tgui

* ready for launch - not tested yet

* build

* built ui

* bitflag readability and bye oldcode!

* bepis

* build ui
2020-06-01 00:22:40 +02:00
DeltaFire b98f2532d5 little thing 2020-05-31 20:25:21 +02:00
DeltaFire bb7a2c43a8 First of many changes
Adds the possibility for stationside clockwork obelisks to create stable gateways with unlimited uses, linking between the station and reebe. The gateway scripture no longer can teleport cultists from or to reebe. Spatial gateway from obelisks still works, but it is FAR less power efficient.
These gateways are closed via either hitting them with a nullrod, destroying their obelisk, or a cultist initiating their close sequence via a 80ds doafter with the slab used on the gateway.
2020-05-31 20:23:57 +02:00
Lin 348885a58d Merge pull request #12382 from Ghommie/Ghommie-cit797
Slight simple mob boss improvements.
2020-05-31 15:22:23 +00:00
Ghommie 2f3fd48b84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-05-31 16:08:52 +02:00
Sonic121x b7411bf9a0 Fix The X-01 Multiphase energy gun box (#12409)
Fix /obj/item/storage/secure/briefcase/hos/multiphase_box/PopulateContents()
2020-05-31 13:50:31 +02:00
Letter N 151df41d1c asset cache + better minimaps 2020-05-31 16:15:09 +08:00
Ghom 48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392)
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
2020-05-31 00:54:28 -07:00
kevinz000 abc2b820a4 Update living_blocking_parrying.dm 2020-05-30 23:49:04 -07:00
kevinz000 faf65ae2b5 Merge branch 'combat_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into combat_rework 2020-05-30 23:46:34 -07:00
kevinz000 5b6e797c4f desword adjustments 2020-05-30 23:43:05 -07:00
kevinz000 250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000 34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000 d832cb6526 fix 2020-05-30 22:43:23 -07:00
kevinz000 2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000 1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00
kevinz000 c613726c2a render 2020-05-30 22:05:19 -07:00
kevinz000 e6020ca22c variable render 2020-05-30 21:02:13 -07:00
kevinz000 0723399ed4 render 2020-05-30 20:55:33 -07:00
kevinz000 d47841ee54 documentation 2020-05-30 20:38:07 -07:00
kevinz000 588443e928 fix 2020-05-30 20:12:50 -07:00
kevinz000 e5c32c1746 changes 2020-05-30 20:11:18 -07:00
kevinz000 502873cb7c Delete bindings_living.dm 2020-05-30 18:19:39 -07:00
kevinz000 4a971a223c Delete bindings_mob.dm 2020-05-30 18:19:04 -07:00
Letter N af1aa9758d matrix and orbit thing (#12399) 2020-05-31 02:20:20 +02:00
Ghom bfd23bec04 That won't help us. 2020-05-31 01:50:17 +02:00
Ghom effd1b0158 Fixing bedsheet magic in a better fashion. 2020-05-31 01:46:16 +02:00
Ghom 25dbed5b0b Made the decal component an element. (#12388)
* Made the decal component an element.

* Is this really worth it?

* Oh.
2020-05-30 14:06:53 -07:00
Ghom f572fe4607 Revert "Framework for (hopefully) reducing memory usage by replacing thousands of decals with turfs that look visually identical (#12383)" (#12387)
This reverts commit ab86d669a7.
2020-05-30 14:06:38 -07:00
Ghommie 9a9e76664f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 22:47:13 +02:00
Ghommie 949e8f6b3a WIP 2020-05-30 21:53:14 +02:00
Artur 19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
Ghommie 745695e60d WIP, js tiring. 2020-05-30 15:55:16 +02:00
L 4b19e5863e cooldown 2020-05-30 06:16:34 -03:00
kevinz000 9d4d6e6b6f your goddamn ass isn't a constant expression 2020-05-30 02:12:49 -07:00
kevinz000 3251338d31 fix 2020-05-30 02:01:06 -07:00
kevinz000 519552cb78 more handling 2020-05-30 01:59:58 -07:00
kevinz000 1214c99a34 is this a good idea 2020-05-30 01:46:43 -07:00
kevinz000 b74d465b6c fix 2020-05-30 01:22:09 -07:00
kevinz000 6b0b20b171 infinite loop protection 2020-05-30 01:00:41 -07:00
kevinz000 05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
kevinz000 f63bc2e2d3 flags 2020-05-30 00:42:41 -07:00
kevinz000 ae9fc5789d adds more support to stuff 2020-05-30 00:35:17 -07:00
Putnam3145 266707b119 Readded feeding to simplemobs (#12378) 2020-05-29 20:01:51 -07:00
kevinz000 f8741b6a0b adjust 2020-05-29 19:50:11 -07:00
kevinz000 517cd26ed3 Delete living_combat.dm 2020-05-29 19:19:49 -07:00
kevinz000 65bb3bbb91 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-29 19:13:22 -07:00
kevinz000 92a537da63 Damage fix 2020-05-29 19:12:46 -07:00
kevinz000 a8c0681e99 parrying works 2020-05-29 18:58:02 -07:00