deathride58
e4410a3320
Merge branch 'master' into mapsyncs43293845982
2018-01-08 06:18:11 +00:00
deathride58
9decb2e2b2
Update overmind.dm
2018-01-07 23:18:28 -05:00
MoreRobustThanYou
02b63e199b
Adds spaceturf check to blob overmind spawning
2018-01-07 20:52:01 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
LetterJay
7d4a51f659
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463
2018-01-01 04:36:29 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
AnturK
7c0b21012f
Adds blob roundend report. ( #33463 )
...
* Adds blob roundend report. (Also adminabuse)
* Old comment
* Grammer
* Moves antag to seperate file
2017-12-14 01:39:36 -06:00
MoreRobustThanYou
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
deathride58
1d8618eaca
Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
...
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
ShizCalev
5abd1bcdd9
Cleans up some qdel(src)'s in Initialize()
2017-11-26 20:15:18 -06:00
ShizCalev
4a22fed89d
Cleans up goldcore defines
2017-11-26 16:51:44 -06:00
KorPhaeron
ddddac262e
Fixes blobbernaut spawning ( #32954 )
...
* Fixes blobbernaut spawning
* There is no mob yet, we can't poll for it
2017-11-21 22:27:49 -06:00
KorPhaeron
47b9cc2051
Fixes suicidal blobbernauts ( #32851 )
...
* Fixes suicidal blobbernauts
* Removes notransform
2017-11-18 18:37:50 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
LetterJay
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
Tad Hardesty
aa8581d430
Fix the station integrity report to read the correct Z
...
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
2017-11-14 12:45:47 -06:00
MoreRobustThanYou
4b7970f4f7
Xenobio blobbernauts can no longer walk on blob tiles ( #32446 )
2017-11-07 10:30:21 -06:00
MoreRobustThanYou
9cdf151a60
Blobbernauts and spores are no longer killed by blob victory ( #32133 )
...
* Blobbernauts and spores are no longer killed by blob victory
* Update overmind.dm
* Update overmind.dm
* Update overmind.dm
* Update overmind.dm
2017-11-05 12:07:12 -06:00
LetterJay
4dc2ac3d94
Merge branch 'master' into upstream-merge-31913
2017-10-23 01:25:35 -04:00
LetterJay
dadc96ef98
Update overmind.dm
2017-10-22 10:50:58 -05:00
KorPhaeron
c42e1b17f4
Blob fixes
2017-10-21 14:08:10 -05:00
LetterJay
b7c8330761
Update blob_report.dm
2017-10-20 09:33:39 -05:00
KorPhaeron
20b17eceec
Disentangles blob from blob mode/removes blob mode
2017-10-18 20:55:42 -05:00
Leo
39cf9bb7a0
Merge pull request #31286 from KorPhaeron/ismachinery
...
ismachinery define
2017-10-04 19:26:38 -05:00
LetterJay
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
vuonojenmustaturska
98d6927eb6
Cleanup to various loc assignments and nearby code
2017-09-30 08:10:52 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
CitadelStationBot
b1ba49f37e
[MIRROR] Blobbernauts are healed quicker by cores and nodes ( #2821 )
...
* Blobbernauts are healed quicker by cores and nodes (#30527 )
* Blobbernauts are healed quicker by cores and nodes
i hate sitting for 3-5 minutes waiting to heal as a naut
* no you can't heal without a factory
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Update blob_mobs.dm
* Blobbernauts are healed quicker by cores and nodes
2017-09-17 22:23:08 -05:00
CitadelStationBot
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
CitadelStationBot
9a4f84da5e
[MIRROR] Refactors roundstart centcom threat report. ( #2739 )
...
* Refactors roundstart centcom threat report.
* Update blob.dm
* Update changeling.dm
* Update traitor_chan.dm
* Update sandbox.dm
* Update traitor.dm
2017-09-13 22:50:01 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
LetterJay
685c534d88
Merge pull request #2681 from Citadel-Station-13/upstream-merge-30524
...
[MIRROR] Removes a src.
2017-09-10 09:47:01 -05:00
CitadelStationBot
b363dc352f
[MIRROR] remove GLOB. ( #2683 )
...
* Merge pull request #30540 from p440/blobglob
remove GLOB.
* remove GLOB.
2017-09-10 09:07:18 -05:00
oranges
ee4052eb61
Merge pull request #30524 from ChangelingRain/srcremoval
...
Removes a src.
2017-09-10 06:02:06 -05:00
CitadelStationBot
e353091c47
[MIRROR] Fixes shield blobs not blocking atmos ( #2575 )
...
* Fixes shield blobs not blocking atmos
* atmosia blocking
2017-09-04 02:47:09 -05:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
LetterJay
95cbe66a3a
Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870
...
[MIRROR] Fixes a typo in the blobbernaut spawn text
2017-08-18 13:41:37 -05:00
LetterJay
8a7c0e657f
Update powers.dm
2017-08-18 11:20:36 -05:00
CitadelStationBot
4bd5e318c2
Blobs can now sense loving cuddles!
2017-08-16 18:00:54 -05:00
CitadelStationBot
7aa960b499
Fixes a typo in the blobbernaut spawn text
2017-08-14 01:23:57 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
5d0f206936
Replaces blob's send intercept sleep() with addtimer
2017-08-05 12:20:41 -05:00
CitadelStationBot
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07:00
