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
Ashe Higgs
0ae0c44991
Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-06 16:37:15 -06:00
oranges
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
arsserpentarium
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
LetterJay
2230c79af3
Update unsorted.dm
2017-11-09 03:17:35 -06:00
kevinz000
b44e31951d
Weakrefs
2017-11-09 00:49:01 -06:00
kevinz000
8a7f8c9bc6
Fixes admin buildmode stripping people naked yet again, adds GetAllContentsIgnoring ( #31769 )
...
* Add GetAllContentsIgnoring which accepts an ignore typecache to ignore
* Update turf.dm
* fixes
* Update unsorted.dm
* Update turf.dm
2017-10-31 09:09:02 -05:00
Jordan Brown
f36d3ff08a
Line by line profiling system
2017-10-27 13:10:21 -05:00
Remie Richards
649fe581fd
Actual performance improvements for GetAllContents ( #32029 )
...
* Actual performance improvements for GetAllContents
* Shaving off literal tens of clock cycles
2017-10-26 05:02:36 -05:00
YPOQ
796d61a2dc
Fixes get_turf_pixel returning null when called on turfs ( #32000 )
2017-10-23 09:00:35 -05:00
Poojawa
7eb2af06c3
fixes compile
2017-10-21 22:18:19 -05:00
Jordan Brown
ff1a3e9f0a
Safeguards GetAllContents and makes it throw a warning
2017-10-21 18:56:14 -05:00
CitadelStationBot
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
Jordan Brown
fafdf339ff
Adds a duplicate stack_trace to /datum ( #31783 )
2017-10-16 22:56:44 -05:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
ShizCalev
92ec5c11ab
Fixes being able to sell camera mobs to CentCom ( #31306 )
...
* Fixes being able to sell camera mobs to CENTCOM
* Did it Ninja's way.
2017-10-07 19:13:28 -05:00
LetterJay
0ab234ceb0
Merge branch 'master' into upstream-merge-31000
2017-10-01 03:31:49 -04:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
Jordan Brown
116041d621
Server tools API v3.1
2017-09-28 22:20:46 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
Emmett Gaines
16f1ceedd1
GetAllContents performance increase ( #31027 )
2017-09-28 10:44:28 -05:00
CitadelStationBot
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
kevinz000
0925cb108b
wew
2017-08-29 22:09:42 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
90e1bbd3e1
Megafauna will now always show up in the orbit list
2017-08-16 01:01:06 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
CitadelStationBot
f5bc18bb55
buildmode fix + blueprints fix ( #2261 )
...
* Fixes Admin Buildmode Mass-Deletion making people nude, gives GetAllContents() an ignore typecache.
* sync turf.dm
2017-08-04 11:46:11 -07:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
CitadelStationBot
7a0c43e492
Makes GetAllContents faster. ( #2036 )
2017-07-17 00:53:50 -07:00
CitadelStationBot
e43af7f1bd
[MIRROR] get_edge_target_turf() now finds the proper turf when using diagonal directions ( #1972 )
...
* get_edge_target_turf() now finds the proper turf when using diagonal directions
* Update camera.dm
2017-07-10 16:15:02 -07:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
83fead2492
Merge pull request #1673 from Citadel-Station-13/upstream-merge-28567
...
[MIRROR] Refactors PDA cartridge permissions
2017-06-27 06:14:42 -05:00
CitadelStationBot
15362206dd
Fixes the server taking for fucking ever to initialize for local test
2017-06-24 22:22:44 -05:00
CitadelStationBot
1dc24668a1
Refactors PDA cartridge permissions
2017-06-19 13:57:18 -05:00
LetterJay
cc7c07ccf3
Update unsorted.dm
2017-06-13 02:49:38 -05:00
CitadelStationBot
d9e3699f88
Ports Goonchat
2017-06-08 16:27:56 -05:00
LetterJay
60da3ff9b8
Original mirrored too much.
2017-06-05 07:18:29 -05:00
CitadelStationBot
11344c4682
Refactors explosions
2017-05-24 16:45:00 -05:00
CitadelStationBot
4afae3d03b
Makes global master vars static
2017-05-22 22:12:58 -05:00
CitadelStationBot
26448d7016
Removes the mess added with recalling with a message
2017-05-21 07:57:17 -05:00
CitadelStationBot
33941c29c8
[MIRROR] People can be cloned from heads or brains ( #919 )
...
* People can be cloned from heads or brains
* .rej fixes
* Update cloning.dm
2017-05-18 09:49:26 -05:00
CitadelStationBot
310f23db5c
Fixes HTTPSGet being unprotected
2017-05-06 10:46:00 -05:00
CitadelStationBot
a0c1f979dc
Fixes templates/ruins not updating area list
2017-04-27 17:02:33 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
CitadelStationBot
05d8550771
Refactors picture frames to use wall frames system
2017-04-21 17:54:34 -05:00