 LetterJay
|
2eb7872a6a
|
Merge pull request #1285 from Citadel-Station-13/upstream-merge-27782
[MIRROR] Adds coalesce to world.internet_address
|
2017-06-05 02:12:56 -05:00 |
|
|
LetterJay
|
803f7a46c4
|
magic SQL shit
|
2017-06-05 01:56:23 -05:00 |
|
|
CitadelStationBot
|
94405f5176
|
Lowers supermatter damage hardcap by 75% to compensate for high speed atmos processing (#1363)
|
2017-06-04 09:10:35 -07:00 |
|
|
CitadelStationBot
|
e0b5221ebd
|
The Crafting Menu now has subcategories! (#1364)
|
2017-06-04 09:09:59 -07:00 |
|
|
CitadelStationBot
|
6e632190b3
|
Planned Spaceparenthood would like to apologize for mislabeling their cloning pod ejection buttons. (#1366)
|
2017-06-04 09:09:44 -07:00 |
|
|
CitadelStationBot
|
618d893388
|
wat (#1380)
|
2017-06-04 09:09:15 -07:00 |
|
|
CitadelStationBot
|
159f78efe7
|
Fixes #27989 : Riot suits no longer hide jumpsuits (#1379)
|
2017-06-04 09:09:03 -07:00 |
|
|
CitadelStationBot
|
79f28a732d
|
Buffs chemical grenades (#1372)
|
2017-06-04 09:08:50 -07:00 |
|
|
CitadelStationBot
|
b5d2cf3c99
|
[READY] Stacks will change item_states and w_class based on how full they are. (#1370)
|
2017-06-04 09:08:33 -07:00 |
|
|
CitadelStationBot
|
4ac745a275
|
the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#1375)
|
2017-06-04 09:08:19 -07:00 |
|
|
CitadelStationBot
|
c1adecc0e2
|
Fix AI status displays to use a list instead of the world list (#1391)
|
2017-06-04 09:08:04 -07:00 |
|
|
CitadelStationBot
|
7ec36019d5
|
Refactor another spawned cooldown var (#1383)
|
2017-06-04 09:07:49 -07:00 |
|
|
CitadelStationBot
|
bfe11f8540
|
Fixes #27979 : Bulldog shotguns update properly when their magazine is removed. (#1377)
|
2017-06-04 09:07:36 -07:00 |
|
|
CitadelStationBot
|
8fcbf20c79
|
Another spawn timer (#1388)
|
2017-06-04 09:07:16 -07:00 |
|
|
CitadelStationBot
|
63f9657d9b
|
Refactors a cooldown var to not require a spawn or sleep (#1381)
|
2017-06-04 09:06:47 -07:00 |
|
|
CitadelStationBot
|
e57863cfe1
|
Refactor another spawn cooldown (#1385)
|
2017-06-04 09:06:38 -07:00 |
|
|
CitadelStationBot
|
1e12557776
|
Remove spawns in favour of stacktrace calls, which don't stop the called (#1382)
|
2017-06-04 09:06:27 -07:00 |
|
|
CitadelStationBot
|
6def6cddda
|
Refactors yet another spawn cooldown (#1384)
|
2017-06-04 09:06:14 -07:00 |
|
|
CitadelStationBot
|
ae1e159673
|
Remove a commented out function (#1389)
|
2017-06-04 09:06:02 -07:00 |
|
|
CitadelStationBot
|
8dae545d59
|
Goodbye spawn (#1387)
|
2017-06-04 09:05:47 -07:00 |
|
|
CitadelStationBot
|
c77607e411
|
This doesn't do anything (#1390)
|
2017-06-04 09:05:28 -07:00 |
|
|
CitadelStationBot
|
9023e0ff67
|
refactor another spawn cooldown (#1392)
|
2017-06-04 09:05:12 -07:00 |
|
|
CitadelStationBot
|
1c1cbe8e5b
|
Refactor another spawn var (#1395)
|
2017-06-04 09:04:56 -07:00 |
|
|
CitadelStationBot
|
9f02ba1245
|
Refactors another spawn cooldown var (#1393)
|
2017-06-04 09:04:49 -07:00 |
|
|
CitadelStationBot
|
bf4973e580
|
Refactor another spawn (#1394)
|
2017-06-04 09:04:32 -07:00 |
|
|
CitadelStationBot
|
0455bf5f9a
|
we have to move forward with grammar fixes (#1397)
|
2017-06-04 09:04:03 -07:00 |
|
|
CitadelStationBot
|
c36e599a6a
|
Fixes AOE modkits not working because I messed up the logic (#1400)
|
2017-06-04 09:03:45 -07:00 |
|
|
CitadelStationBot
|
eeda9fd77f
|
Proposal: typed map variables (#1398)
|
2017-06-04 09:03:38 -07:00 |
|
|
CitadelStationBot
|
e59e7f8d06
|
Fixes bsa not showing up (#1396)
|
2017-06-04 09:03:30 -07:00 |
|
|
CitadelStationBot
|
13767b91ad
|
Fixes admiral recall (#1374)
|
2017-06-04 02:18:42 -07:00 |
|
|
CitadelStationBot
|
272448de4f
|
Fixes janicart offsets. (#1362)
|
2017-06-03 15:17:48 -07:00 |
|
|
CitadelStationBot
|
c82c71a6c1
|
Removes poison pen. (#1295)
|
2017-06-03 06:39:23 -07:00 |
|
|
CitadelStationBot
|
f8505883d4
|
Removes dragoontomb ruin and loot. (#1290)
|
2017-06-03 06:39:11 -07:00 |
|
|
CitadelStationBot
|
fa305c2aec
|
[MIRROR] Fix NOPOWER being set incorrectly for holopads (#1300)
* Fix NOPOWER being set incorrectly for holopads
* Update hologram.dm
* Delete hologram.dm.rej
|
2017-06-03 06:37:30 -07:00 |
|
|
CitadelStationBot
|
043d9b478e
|
Gives the janitor a flyswatter in their roundstart equipment (#1354)
|
2017-06-03 06:37:08 -07:00 |
|
|
CitadelStationBot
|
11d5262e0c
|
Dominator colors are now directly determined by the gang's color (#1355)
|
2017-06-03 06:36:49 -07:00 |
|
|
CitadelStationBot
|
32c288dfc8
|
Gives the pod people's dispenser all the chemicals they could ever want. (#1357)
|
2017-06-03 06:36:34 -07:00 |
|
|
CitadelStationBot
|
4a84f13ed0
|
Revert "[s]Revert "Revert "Revert "Revert "Revert "Revert "Typos in syndicate uplink descriptions""""""" (#1359)
|
2017-06-03 06:35:03 -07:00 |
|
|
CitadelStationBot
|
dfcd326337
|
[MIRROR] Typos in syndicate uplink descriptions (#1341)
* Typos in syndicate uplink descriptions
* Delete uplink_item.dm.rej
|
2017-06-03 06:28:48 -07:00 |
|
|
CitadelStationBot
|
263b79b299
|
[MIRROR] Individual logs are no longer lost with mob changes (#1249)
* Individual logs are no longer lost with mob changes
* Delete mob_defines.dm.rej
|
2017-06-02 22:01:58 -07:00 |
|
|
CitadelStationBot
|
79ff2672b4
|
[MIRROR] Clean snow, lavaland, and thunderdome (#1261)
* Clean snow, lavaland, and thunderdome
* Delete mining.dm.rej
|
2017-06-02 22:01:46 -07:00 |
|
|
CitadelStationBot
|
a70043afa2
|
[MIRROR] Reboot initiated by an admin will never be delayed (#1272)
* Reboot initiated by an admin will never be delayed
* Update ticker.dm
* Delete ticker.dm.rej
|
2017-06-02 22:01:39 -07:00 |
|
|
CitadelStationBot
|
d74b8d187a
|
Binary talk now logs in the individual logging (#1335)
|
2017-06-02 22:01:15 -07:00 |
|
|
LetterJay
|
976c1244dd
|
Config shit for cards (#1310)
|
2017-06-02 21:56:08 -07:00 |
|
|
CitadelStationBot
|
2dc13e6242
|
makes machineguns pass their users to their fire helpers instead of the floor (#1256)
|
2017-06-02 21:46:15 -07:00 |
|
|
CitadelStationBot
|
b85384c0ad
|
Fixes meteor and immoveable rods hitting Centcomm (#1252)
|
2017-06-02 21:36:45 -07:00 |
|
|
CitadelStationBot
|
bdd4f9d17f
|
Allows explorer webbings to hold marker beacons (#1219)
|
2017-06-02 21:35:41 -07:00 |
|
|
CitadelStationBot
|
9873fe0957
|
Buffs nitrous oxide (#1339)
|
2017-06-02 21:22:08 -07:00 |
|
|
CitadelStationBot
|
dbc902ef29
|
Fixes martial arts resetting on cloning. (#1338)
|
2017-06-02 21:21:47 -07:00 |
|
|
CitadelStationBot
|
2c7e3ad4f7
|
Makes op belts less brown (#1336)
|
2017-06-02 21:18:26 -07:00 |
|