Lin
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Solaris-Shade
c5be81c589
tg moved projectiles out of /item, added '/item' back
2022-03-06 16:29:58 -05:00
Solaris-Shade
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
silicons
f85d0dbda0
Merge pull request #15449 from Putnam3145/gib-podpeople
...
Allows pod people to be made using other fluids
2022-01-22 04:34:59 -08:00
Lin
d7cbb017f6
Fix few instances of bleeding white blood ( #15398 )
...
* no longer bleed white blood
* parentheses man
* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
Putnam3145
c392b7c3fb
Allows pod people to be made using other fluids
2021-12-31 14:36:55 -08:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
keronshb
1cd2c59776
Merge branch 'master' into familyport
2021-10-15 14:43:53 -04:00
keronshb
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
Hatterhat
1d005db9a8
THE YEEHAW UPDATE
2021-09-30 23:10:33 -05:00
zerothebigboy
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
Putnam3145
f1560cb807
fixing a bunch of unit test/runtime issues
2021-07-25 18:40:11 -07:00
silicons
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
Artur
b71a6497e8
Crafting menu fixes and such
...
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
Putnam3145
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
silicons
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
silicons
4a5ca2b851
woo
2021-06-28 22:15:25 -07:00
silicons
7091b0467d
cleaner
2021-06-28 19:30:00 -07:00
silicons
07af6b755f
that
2021-06-28 19:17:15 -07:00
silicons
d59ced8f28
changes
2021-06-28 19:15:29 -07:00
silicons
5ef742ffc1
logic
2021-06-28 18:46:25 -07:00
silicons
e690cea147
fix
2021-06-28 18:33:14 -07:00
Lin
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
Putnam3145
f77495f45d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-21 02:19:51 -07:00
silicons
29604b939c
Update glowshroom.dm
2021-06-20 13:18:54 -07:00
silicons
8f3c1fe03a
Update glowshroom.dm
2021-06-19 07:02:51 -07:00
silicons
c0e3af55bc
Update glowshroom.dm
2021-06-19 06:59:26 -07:00
silicons
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
Putnam
78cf3463ba
Updates to master
...
Closes #14823
2021-06-11 16:29:04 -07:00
Putnam
833d34ba8e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-06-11 16:28:12 -07:00
Putnam
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
silicons
a7781f77fd
Merge pull request #14802 from bunny232/atmosfoam
...
Atmos resin buff? fix?
2021-06-09 11:15:56 -07:00
silicons
716c2a04e4
Merge pull request #14160 from keronshb/motivation
...
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
Putnam
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
silicons
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
bunny232
7826ced174
Update effects_foam.dm
2021-06-06 12:54:07 -04:00
silicons
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
silicons
97dcfd0750
Update effects_foam.dm
2021-05-06 02:02:25 -07:00
silicons
6ac964b35a
e
2021-05-06 01:52:35 -07:00
silicons
d547aa7ff1
almost compiling
2021-04-26 23:37:26 -07:00
keronshb
20c190c17d
Merge remote-tracking branch 'upstream/master' into motivation
2021-04-14 17:55:24 -04:00
silicons
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
kiwedespars
5ce42584b2
void tp effect, sound changes
2021-03-10 21:16:08 -08:00
kiwedespars
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
silicons
0f16178425
changes
2021-02-28 02:43:32 -07:00
silicons
8fc1dc9c29
changes
2021-02-28 00:40:04 -07:00
