Putnam3145
|
5d574acdc2
|
Merge pull request #14794 from Citadel-Station-13/silicons-patch-35
updates GLOB.flags to the new byond limit of 24 flags in one variable, up from 16.
|
2021-06-18 00:47:07 -07:00 |
|
silicons
|
eaf36d3137
|
Update _flags.dm
|
2021-06-09 11:16:55 -07:00 |
|
silicons
|
829944640e
|
Update _flags.dm
|
2021-06-04 09:24:15 -07:00 |
|
Linzolle
|
46833abf0b
|
add cult_permitted area flag
|
2021-05-27 19:34:00 -05:00 |
|
necromanceranne
|
0f04bbb23b
|
Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power
|
2021-04-22 13:06:31 +10:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
silicons
|
bf382f490c
|
Merge pull request #14518 from necromanceranne/shield_explodies_fix
Shields: Changes, additional flags, bug fixes, sprites
|
2021-03-27 01:31:55 -06:00 |
|
necromanceranne
|
79de55c58c
|
First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately.
|
2021-03-25 09:07:52 +11:00 |
|
Blue Wildrose
|
3a37cc6325
|
Some sensory detail
|
2021-03-20 06:37:37 -07:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
kiwedespars
|
3ce6459aef
|
void heretic and many other prs
|
2021-03-09 02:58:34 -08:00 |
|
silicons
|
bffc43e95e
|
fixes
|
2021-01-08 18:59:26 -08:00 |
|
uomo91
|
b3e314e3ea
|
Bitflag define.
|
2020-11-16 01:36:46 -06:00 |
|
silicons
|
7f611a98e1
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-10-10 22:23:22 -07:00 |
|
silicons
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
silicons
|
1b1efce556
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-10-06 17:11:21 -07:00 |
|
Putnam
|
0aec88eaed
|
escape those newlines
|
2020-09-29 06:12:10 -07:00 |
|
Putnam
|
8704949694
|
whoops forgot a semicolon
|
2020-09-29 05:58:04 -07:00 |
|
Putnam
|
3839343cd8
|
i forgot to save the #define
|
2020-09-29 05:57:46 -07:00 |
|
silicons
|
1ea0dd9f76
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-09-19 15:56:13 -07:00 |
|
MrJWhit
|
60446316bb
|
Update _flags.dm
|
2020-08-14 21:14:21 -04:00 |
|
silicons
|
0a36f9fbb5
|
changes
|
2020-08-04 22:40:28 -07:00 |
|
silicons
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|
silicons
|
49070d732b
|
ohhhhhhh boy
|
2020-07-26 15:10:08 -07:00 |
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
DeltaFire
|
db823ac16c
|
fixes the organ bitfields
|
2020-07-25 19:13:08 +02:00 |
|
silicons
|
33d5ba788b
|
aight
|
2020-07-24 20:19:18 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
703afec454
|
ok
|
2020-07-23 08:57:15 -07:00 |
|
silicons
|
924309aab8
|
changeS
|
2020-07-20 11:11:12 -07:00 |
|
silicons
|
984796b8c6
|
sigh
|
2020-07-20 10:46:52 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
silicons
|
bd8cc4791f
|
whew
|
2020-07-07 21:02:23 -07:00 |
|
silicons
|
a738d52740
|
oh god oh FUCK
|
2020-07-03 00:11:09 -07:00 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
Timothy Teakettle
|
eba1e8f301
|
fixes the merge conflicts
|
2020-06-15 23:29:49 +01:00 |
|
kevinz000
|
8162303bad
|
Merge remote-tracking branch 'citadel/master' into pp_fix
|
2020-06-13 12:03:01 -07:00 |
|
kevinz000
|
1a9787a9c2
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-06-02 21:49:43 -07:00 |
|
kevinz000
|
05fe0c7dcc
|
ok
|
2020-05-30 00:59:29 -07:00 |
|
kevinz000
|
433bd1af79
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-27 18:11:15 -07:00 |
|
kevinz000
|
e4eb49050c
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-24 15:03:06 -07:00 |
|
kevinz000
|
05068f80db
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-07 10:57:10 -07:00 |
|
kevinz000
|
532aba9157
|
fixes
|
2020-05-07 08:36:15 -07:00 |
|
kevinz000
|
f034c7c536
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-05 17:38:43 -07:00 |
|
kevinz000
|
555702c1d7
|
flag define precedence
|
2020-03-26 12:28:05 -07:00 |
|