MrStonedOne
cdfce3046e
Removes cap on bomb cap
2016-03-15 03:39:43 -07:00
MrStonedOne
71ae9d13aa
Adds lag checks to massedit, sdql2, del-all, and the map loader
2016-03-15 03:39:42 -07:00
MrStonedOne
09fb8c2b10
Explosions and singulo use spiral range (and other changes)
2016-03-15 03:39:41 -07:00
MrStonedOne
2887dc7ce0
Removes lag.
...
This setup allows subsystems to pause themselves until next mc fire if they are about to go over a tick, and resume on the next mc tick
It also makes it so we prioritize running subsystems we skipped because there wasn't enough time in the current tick to run them based on their avg tick usage. (as well as subsystems paused mid way thru)
Adds a macro for adding this to non-mc procs. just drop it in the loop. There is a define version as well for if checks if you want to know if you just slept to avoid lag.
This is all inside #if DM_VERSION defines, so once i test that 509 still works to compile/test this should be good to merge
2016-03-15 03:39:39 -07:00
Cheridan
0288f7c592
Merge pull request #16067 from xxalpha/silky_smooth
...
icon smooth ss
2016-03-15 04:59:48 -05:00
PKPenguin321
443a73fe75
tweaks code slightly as per remie's request
2016-03-14 19:16:32 -07:00
Razharas
b81c54b335
Merge pull request #16078 from PKPenguin321/scoot-scoot-thats-the-sound-of-the-police
...
Adds scooters and skateboards
2016-03-15 05:11:47 +03:00
KorPhaeron
27b03c5a1b
Merge pull request #16115 from LanCartwright/specialistops
...
Adds Firestarter bundle
2016-03-14 18:55:48 -05:00
KorPhaeron
836c1aa104
Merge pull request #16080 from ChangelingRain/ineverstop
...
Blob Tuning: Revenge of the Buff/Nerf
2016-03-14 18:54:03 -05:00
Akke
18897ac972
resderved
2016-03-14 23:24:28 +00:00
PKPenguin321
747538921d
fixes skateboarders being unable to have head on head collisions
...
since they were non-dense they couldn't crash into each other even when there was another person on the other skateboard. this fixes that
2016-03-14 15:55:54 -07:00
KorPhaeron
fa77255e97
Merge pull request #16097 from ChangelingRain/poitext
...
Wizard Greentext is now on the POI list
2016-03-14 17:33:35 -05:00
Nerd Lord
705e822641
blob tooltips now have a custom blob theme(it's actually pretty plain but it's better than using hud theme)
2016-03-14 18:32:52 -04:00
Cheridan
93cb1eb0a0
Merge pull request #16033 from KorPhaeron/its_a_beta_they'll_fix_it
...
Lavaland
2016-03-14 16:47:08 -05:00
KorPhaeron
745538b397
Legion bodies are damaged
2016-03-14 16:14:11 -05:00
KorPhaeron
53989fffa2
Fixes turf picking
2016-03-14 14:56:32 -05:00
KorPhaeron
24eb9bd457
White ship can land on lavaland
2016-03-14 14:44:55 -05:00
KorPhaeron
288017eeb6
In fact lets not buff any of them just yet
2016-03-14 12:16:39 -05:00
KorPhaeron
a0962ab7b8
I made the watcher too scary
2016-03-14 12:14:00 -05:00
KorPhaeron
ad0f888f7c
Ash Walkers
2016-03-14 10:23:26 -05:00
KorPhaeron
cb6de824cb
Monster Nests, more maps
2016-03-14 07:25:26 -05:00
Jordie
ea4febddc7
Merge pull request #16083 from sawu-tg/snpcupdate
...
SNPC Expansion v. Traitorous Scum
2016-03-14 22:06:33 +11:00
PKPenguin321
69372b03ab
adds tablecrafting recipes
...
also makes skateboards nondense because their sprite was so small and it's awkward bumping into something that small
2016-03-13 21:58:04 -07:00
Cheridan
c249ba8ca3
Merge pull request #16076 from KorPhaeron/hungry
...
Re-adds hunger to the game
2016-03-13 21:50:54 -05:00
KorPhaeron
da7c8c036f
Buffs mineral chances to make up for ORM
2016-03-13 21:26:16 -05:00
KorPhaeron
c16a57b43d
Pixel offset fix
2016-03-13 21:06:30 -05:00
KorPhaeron
8868bf1be7
Merge pull request #16072 from xxalpha/lavalvalvalvvalaalva
...
fix template loading runtimes
2016-03-13 20:51:45 -05:00
KorPhaeron
973b66edbb
Lava Monsters
2016-03-13 20:46:51 -05:00
KorPhaeron
b8c94806ec
Merge pull request #16065 from Incoming5643/everyone_gets_a_trophy_day
...
Adds silver, bronze, and pewter trophies
2016-03-13 16:50:26 -05:00
PKPenguin321
6552c6c0b1
code cleanup
...
fixes a case where skateboards can end up in nullspace
adds another do_after
moves a sfx
2016-03-13 14:49:31 -07:00
Incoming
c30f01f452
Some type reshuffling to save a few lines
2016-03-13 17:40:38 -04:00
Cheridan
1ccaf0a1d0
Merge pull request #15991 from KorPhaeron/ore_redemption
...
Ore Redemption Rescaling
2016-03-13 15:17:33 -05:00
Nerd Lord
4357019a18
Wizard Greentext is now on the POI list
2016-03-13 15:53:08 -04:00
KorPhaeron
3af2b0c447
Re-arranges gulag a bit
2016-03-13 04:00:37 -05:00
KorPhaeron
7955bad942
Finally kills the active turfs while retaining functioning river generation
2016-03-13 03:02:06 -05:00
Sawu
fc56e7f529
SNPC Expansion v. Traitorous Scum
...
* Fixes SNPCs still healing people
* SNPCs now use similar speech handling to Poly, and will mimic phrases in addition to their usual speech
* SNPCs can now be spawned as traitors, and given a special role.
* Greytide SNPCs now wear assistant outfits
* Certain jobs are now restricted to their area (can be toggled with restrictedJob)
* SNPCs start with a minor variation in stats
* Bartender SNPCs should now appropriately serve people
* Chef SNPC workflow redone, they will now prioritise preparing food over making it, and should serve more food to tables
* Third attempt at fixing infighting
* SNPCs should no longer repeatedly stun a target
* Friendly SNPCs now no longer have a combat module, and they are the station's faction
* NPCPool will routinely trim orders from it, reducing the amount of order ping-pong
2016-03-13 18:21:37 +11:00
KorPhaeron
e24b6f3608
Merge pull request #15817 from xxalpha/cocks
...
Scrubber clog event now has a chance to spawn cockroaches.
2016-03-13 00:25:59 -06:00
Nerd Lord
3b49362183
full damage
2016-03-12 23:52:42 -05:00
PKPenguin321
0bc274573a
fixes skateboard crashing
2016-03-12 20:49:21 -08:00
Nerd Lord
bd9ec70179
blob tuning
2016-03-12 23:34:29 -05:00
PKPenguin321
8961dbc46f
updates code to come into line with remie's buckling update
...
there is still a huge bug that i will point out on github
2016-03-12 20:11:28 -08:00
PKPenguin321
bceca977ec
adds scooters and skateboards
...
adds scooter.dm for pretty much all scooter-and-skateboard related code
added ability to make a scooter frame to rods.dm
added sprites for the scooter, the skateboard, and the scooter frame to vehicles.dmi
2016-03-12 19:27:48 -08:00
KorPhaeron
8657b74fff
Fixes hunger
...
Hunger
2016-03-12 20:55:02 -06:00
KorPhaeron
d367a5718c
Round
2016-03-12 20:22:38 -06:00
Isratosh
d860726969
Merge branch 'master' into moreheadlamps
...
Updating to mess with overlays.
2016-03-12 19:04:14 -07:00
xxalpha
6f504014b3
fix template loading runtimes
2016-03-13 01:51:10 +00:00
xxalpha
688137c7dc
icon smooth ss
...
adjustments
adjustements
atharrachaidhean
2016-03-12 23:57:45 +00:00
KorPhaeron
8e1a41edc4
Slightly more frequent storms again
2016-03-12 17:20:43 -06:00
KorPhaeron
107aced776
Last fixes hopefully
2016-03-12 16:42:14 -06:00
duncathan salt
fa62cefaac
Merge pull request #15958 from Impisi/ImprovisedShellChanges
...
Improvised Shell Rework Attempt 2
2016-03-12 15:16:08 -06:00