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
silicons
70b8d833c0
changes
2021-02-28 00:00:14 -07:00
SandPoot
123de14009
upload files
2021-02-18 15:05:39 -03:00
SandPoot
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
keronshb
41530110a2
LINTER
...
AHHHH NEW LINE
2021-02-10 20:00:17 -05:00
Timothy Teakettle
5ebdb6deec
yes
2021-02-09 09:37:17 +00:00
keronshb
a4e933185e
Merge remote-tracking branch 'origin/master' into motivation
2021-01-29 09:29:55 -05:00
keronshb
a6725b3c23
Motivation near final
...
Should be almost done after this.
2021-01-28 22:06:25 -05:00
Letter N
02ca168df3
why are we building windows facing nothing but rock infront of it?
2021-01-20 11:37:44 +08:00
silicons
dedb0cb62e
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
The0bserver
1b469bdfda
The power of overwriting...
2021-01-14 01:03:48 -05:00
silicons
9733305997
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-09 14:56:32 -08:00
silicons
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
silicons
1022837827
Update misc.dm
2021-01-08 01:29:20 -07:00
silicons
407b1fe071
Update humans.dm
2021-01-07 23:14:59 -07:00
silicons
78322199e3
fix
2021-01-01 00:38:46 -08:00
silicons
34256a61ef
remove drips
2020-12-30 21:06:34 -08:00
silicons
e6000ceffa
meme
2020-12-29 11:12:06 -08:00
silicons
57d85f7e86
okay
2020-12-27 05:20:29 -08:00
silicons
a42fa987ba
ok
2020-12-26 22:43:25 -08:00
silicons
5266ae1437
okay
2020-12-26 22:28:41 -08:00
silicons
bfb3d087c3
ok
2020-12-26 20:50:28 -08:00
silicons
d3414a4d23
ok
2020-12-26 20:47:50 -08:00
silicons
dafc6bf89f
fix
2020-12-26 20:41:21 -08:00
silicons
3228435237
errors
2020-12-26 20:33:16 -08:00
