KorPhaeron
97af8a919b
Cat
2016-03-17 12:39:20 -05:00
Remie Richards
f21d675fbe
Merge pull request #15849 from Core0verload/jetpack
...
Jetpack nerf revert, new jetpack implant
2016-03-17 00:59:23 +00:00
Cheridan
b3f86a7489
Merge pull request #16146 from TehZombehz/chickennuggets
...
Adds 'Chicken' Nuggets
2016-03-16 19:46:37 -05:00
TehZombehz
5e22c77ab1
Change requested by Kor <3
2016-03-16 17:52:59 -05:00
AnturK
35bfb9abb6
Merge pull request #16073 from KorPhaeron/humans
...
Plasmamen fixes
2016-03-16 17:48:29 +01:00
duncathan salt
46d62be642
Merge pull request #16128 from KorPhaeron/watcher2
...
Fixes watcher becoming invisible when killed
2016-03-16 08:13:32 -06:00
Cheridan
aa614f0bf6
Merge pull request #16124 from Incoming5643/diamond_dogs_are_forever
...
Adds persistence mechanics for Ian
2016-03-16 00:21:45 -05:00
KorPhaeron
7dbec446a8
Merge pull request #16120 from Core0verload/minifix
...
Fixes missing breathing tube icon
2016-03-15 21:35:32 -05:00
Joan Lung
cb3b218f33
Merge pull request #16023 from lordpidey/hud_fix_lordpidey
...
[S] Removes edge cases of traitors seeing own antag hud upon body switch.
2016-03-15 21:30:30 -04:00
TehZombehz
5e1c2cbee7
Fix Kor pointed out (I think)
2016-03-15 13:39:08 -05:00
KorPhaeron
da8baeaab8
Human fixes
2016-03-15 12:29:35 -05:00
KorPhaeron
beefe60f80
Watcher Fix
2016-03-15 08:57:49 -05:00
MrStonedOne
958d9dacfb
Fixes the singularity not eating/pulling turfs.
2016-03-15 04:06:34 -07:00
TehZombehz
6b0c8d8fe8
'Chicken' nuggets added
2016-03-15 05:55:50 -05:00
MrStonedOne
b601033c76
Singulo processes by tile, not atom, to avoid pulling something that's moved.
2016-03-15 03:39:46 -07:00
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
Incoming
b2495ba00c
Adds persistence mechanics to Ian:
...
Ian will remember what hat he's wearing between rounds provided he survives
Ian will record his age in rounds survived. This has two special conditions:
1. The round after Ian is killed, he'll be a puppy
2. Any round where Ian ties or beats his previous age record he'll be old Ian, with a little doggy wheelchair.
Also includes a hopeful fix to catsplosion: Cats are never supposed to give birth to more than three kittens, but the check for these children used an oview, which excluding kittens on the cats tile (where they all start)
2016-03-15 00:53:26 -04:00
c0
a2cef6d30c
Fixes missing breathing tube icon
2016-03-15 05:22:11 +03: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
