kevinz000
|
02e8a73265
|
Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
|
2019-11-14 16:45:09 -07:00 |
|
kevinz000
|
d5a245945c
|
Merge pull request #9742 from Seris02/gpsthing
makes gps show location on examine
|
2019-11-14 16:44:40 -07:00 |
|
kevinz000
|
178aedc5cc
|
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
|
2019-11-14 16:38:27 -07:00 |
|
kevinz000
|
40523802f3
|
Merge pull request #9804 from Ghommie/Ghommie-cit351
Unmodularize keybindings.
|
2019-11-14 16:36:55 -07:00 |
|
kevinz000
|
ca99a8285c
|
Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
|
2019-11-14 16:36:19 -07:00 |
|
kevinz000
|
5b5e655b18
|
Merge pull request #9801 from Ghommie/Ghommie-cit348
Fixing anti-meta hidden random event reports.
|
2019-11-14 16:28:07 -07:00 |
|
kevinz000
|
d6f540faf7
|
Merge pull request #9796 from Ghommie/Ghommie-cit347
Unmodularize airlocks.
|
2019-11-14 16:24:56 -07:00 |
|
kevinz000
|
bd650e53da
|
Merge pull request #9795 from Ghommie/Ghommie-cit346
Unmodularize areas.
|
2019-11-14 16:24:36 -07:00 |
|
kevinz000
|
b670c94ca4
|
Merge pull request #9790 from PersianXerxes/lowerMeteorWarnings
Reducing meteor warning time
|
2019-11-14 16:24:10 -07:00 |
|
kevinz000
|
81303b1225
|
Merge pull request #9786 from Ghommie/Ghommie-cit345
Fixing some reagents taste descriptions.
|
2019-11-14 16:22:54 -07:00 |
|
kevinz000
|
178501f415
|
Merge pull request #9785 from Ghommie/Ghommie-cit344
tweaked towel sprites tonalities and fixing their onmob suit overlay.
|
2019-11-14 16:22:28 -07:00 |
|
kevinz000
|
8c247a566a
|
Merge pull request #9783 from Ghommie/Ghommie-cit343
Fixing Aux base camera RCD door settings and toggle window type actions.
|
2019-11-14 16:22:08 -07:00 |
|
kevinz000
|
9b56aa0cae
|
Merge pull request #9781 from Hatterhat/northstar-fast-intents
northstar works on all intents, is slightly better than help intenting people with the hugs hands
|
2019-11-14 16:18:31 -07:00 |
|
kevinz000
|
b8f59abe34
|
Merge pull request #9780 from Hatterhat/fastredbutton
the one PR about making big red buttons detonate syndibombs faster
|
2019-11-14 16:15:10 -07:00 |
|
kevinz000
|
4ad56ac1e2
|
Merge pull request #9614 from Trilbyspaceclone/patch-234
Lowers ghosts and insain clowns hp to 120 from 1e6
|
2019-11-14 16:07:43 -07:00 |
|
kevinz000
|
4c89b8c33f
|
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
|
2019-11-14 16:00:45 -07:00 |
|
kevinz000
|
6909857e04
|
Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
|
2019-11-14 15:58:53 -07:00 |
|
kevinz000
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
kevinz000
|
499afa6666
|
Merge pull request #9663 from Trilbyspaceclone/patch-235
Buffs/Fixes embalming
|
2019-11-14 15:54:38 -07:00 |
|
kevinz000
|
47f01907f0
|
Merge pull request #9666 from Ghommie/Ghommie-cit296
Shameless late game crew nerf
|
2019-11-14 15:54:13 -07:00 |
|
kevinz000
|
d15a1b0e6b
|
Merge pull request #9680 from Owai-Seek/extendedbounties
Reworked a bit of bounty stuff.
|
2019-11-14 15:53:07 -07:00 |
|
kevinz000
|
318c03cc28
|
Merge pull request #9683 from Ghommie/Ghommie-cit303
Dullahans fixes and QoL.
|
2019-11-14 15:52:11 -07:00 |
|
kevinz000
|
8f08e1017e
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2019-11-14 15:51:20 -07:00 |
|
kevinz000
|
d8e89b235f
|
Merge pull request #9689 from Ghommie/Ghommie-cit307
How many times I have encountered this sort of issue in the past and how much of a meme it was...
|
2019-11-14 15:50:52 -07:00 |
|
kevinz000
|
09e5cd95a3
|
Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-14 15:50:20 -07:00 |
|
kevinz000
|
617b0db310
|
Merge pull request #9692 from Ghommie/Ghommie-cit309
Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin.
|
2019-11-14 15:48:34 -07:00 |
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
kevinz000
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
kevinz000
|
d1ea2d9990
|
Merge pull request #9554 from NopemanMcHalt/assu
[READY] Desperate Assistance Battleforce
|
2019-11-14 15:43:51 -07:00 |
|
kevinz000
|
487f98bf68
|
Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
|
2019-11-14 01:40:16 -07:00 |
|
kevinz000
|
f1612f6619
|
Merge pull request #9791 from kappa-sama/revolverports
ports TG's nicer revolver sprites for russian revolvers, normal .357 revolvers, and golden .357
|
2019-11-14 01:39:21 -07:00 |
|
kevinz000
|
e70a76085c
|
Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
Corrects the descriptions of meth and ephedrine
|
2019-11-14 01:38:01 -07:00 |
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
Ghommie
|
2f1a76c21e
|
Unmodularize keybindings.
|
2019-11-13 23:57:49 +01:00 |
|
Ghommie
|
2c1740f56e
|
#43012 and missing typepaths aaaa
|
2019-11-13 23:26:03 +01:00 |
|
kappa-sama
|
6ad9c7fef0
|
no shotgun i guess
shit guess i gotta add this to traumas too
|
2019-11-13 17:01:30 -05:00 |
|
kappa-sama
|
17d8998fef
|
emergent gameplay
|
2019-11-13 16:58:51 -05:00 |
|
Ghommie
|
aa441fba5d
|
Ports Improved beach away mission.
|
2019-11-13 22:52:39 +01:00 |
|
Ghommie
|
29deebbd23
|
Fixing anti-meta event announcements.
|
2019-11-13 19:01:11 +01:00 |
|
TrilbySpaceClone
|
73661cfe52
|
more fixing+ chem selling tweaks
|
2019-11-13 09:39:42 -05:00 |
|
TrilbySpaceClone
|
de1ce4afc8
|
more crates and explote fixing
|
2019-11-13 09:15:44 -05:00 |
|
TrilbySpaceClone
|
ec57e28c17
|
Merge branch 'master' into Cargo_MKII
|
2019-11-13 08:00:24 -05:00 |
|
Anonymous
|
837052740a
|
Merge branch 'master' into assu
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
|
2019-11-13 11:59:53 +03:00 |
|
kevinz000
|
4e3147b228
|
Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
|
2019-11-12 23:59:31 -07:00 |
|
kevinz000
|
18993c735a
|
Merge pull request #9771 from Ghommie/Ghommie-cit338
Porting Robustin's Syndicate Infiltrator PR from tee-gee
|
2019-11-12 23:58:46 -07:00 |
|
kevinz000
|
e142ed03dd
|
Merge pull request #9773 from Ghommie/Ghommie-cit339
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
|
2019-11-12 23:58:15 -07:00 |
|
kevinz000
|
8920930679
|
Merge pull request #9765 from dapnee/let's-fix-lockers
Ports Closet & Crate Initialization Fixes
|
2019-11-12 23:57:39 -07:00 |
|
kevinz000
|
a16219d97a
|
Merge pull request #9772 from DeltaFire15/weh
Adds eight new plushies to the game while integrating kevs' plush PR
|
2019-11-12 23:56:01 -07:00 |
|
Ghommie
|
b83f92be0e
|
Unmodularize airlocks.
|
2019-11-13 06:50:35 +01:00 |
|
Ghommie
|
f55a602319
|
Unmodularize areas.
|
2019-11-13 06:13:18 +01:00 |
|