cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-08 00:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,391 Commits 2 Branches 1 Tag
273f729eee822fa656ebec8f15ee1fbb26395d4e
Commit Graph

3811 Commits

Author SHA1 Message Date
Zuhayr
273f729eee Several drone fixes (walking over, pushing, pulling, AI sync) 2014-05-31 22:28:05 +09:30
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev" 
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
 2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00
Zuhayr
045168ba17 Merge pull request #5082 from mwerezak/inaprovaline 
Inaprovaline no longer a substitute for breathing
 2014-05-29 11:19:18 +09:30
mwerezak
47a7617edd Inaprovaline no longer a substitute for breathing 2014-05-28 11:27:21 -04:00
Zuhayr
8f50fbcd3b Fixes #4940 2014-05-28 17:00:31 +09:30
Zuhayr
c2b97b7fcb Fixes #4643 2014-05-28 16:41:54 +09:30
mwerezak
fbaa84c509 More sensible oxyloss scaling 2014-05-27 02:41:12 -04:00
mwerezak
694f0706bb Fixes inhale_pp ratio 
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?

Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
 2014-05-27 02:39:32 -04:00
Zuhayr
dcbe9ce061 Merge pull request #5048 from Hubblenaut/dev-freeze 
Paper bundle fixes and other general game improvements
 2014-05-26 23:18:27 +09:30
Ccomp5950
ff0d667337 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2014-05-24 19:02:16 -05:00
Hubblenaut
4aff667d69 Spelling correction: It's called 'Accessory', not 'Accessoires'. Dang. 2014-05-23 23:23:25 +02:00
Hubblenaut
5736200d18 Strip interface changes: Accessories, Pockets, Suit Sensors 2014-05-23 17:56:27 +02:00
Zuhayr
56bdd108f9 Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag. 2014-05-18 10:59:47 +09:30
Zuhayr
e3f0bcd118 Adds PASSEMOTES flag to setup.dm, dionaea and borers. 2014-05-18 10:50:13 +09:30
Ccomp5950
7c1d8b32d0 Humanoid mobs won't default to having an undershirt. 2014-05-17 16:01:49 -05:00
Chinsky
99c6598fd1 Merge pull request #5012 from Zuhayr/dev 
Derp.
 2014-05-17 08:55:50 +04:00
Zuhayr
5585da89c6 Derp. 2014-05-17 14:20:53 +09:30
Zuhayr
1679b4062f Merge pull request #4985 from jack-fractal/dev 
Masks of Nar'sie - Testing Version
 2014-05-17 14:01:00 +09:30
Zuhayr
7739e9954d Fixed an oversight in held icon rendering for humans. 2014-05-17 13:50:08 +09:30
Zuhayr
8f97e9965b Added leap and gut verbs to vox. 2014-05-17 13:49:45 +09:30
Zuhayr
911218067c Added computer boards and gas tanks to the drone gripper (oversight). 2014-05-17 13:45:02 +09:30
Zuhayr
06883912e4 Commented out some debug lines. 2014-05-17 13:37:32 +09:30
Chinsky
91751cb56d Merge pull request #5005 from Zuhayr/mobcache 
Caching system for human icons, generalized breathing.
 2014-05-17 07:57:54 +04:00
Zuhayr
3aa1609ce6 Merge pull request #4998 from mwerezak/camera-alarm-cleanup 
AI and cyborg alarm code cleanup
 2014-05-17 10:38:16 +09:30
jack-fractal
bd3eeca855 fixing the player panel to work with spirits and masks 2014-05-16 19:19:22 -04:00
Ccomp5950
cb093122d2 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-05-16 18:11:11 -05:00
jack-fractal
feecd8dc2b removing debugging junk from the spirit topics follow commands 2014-05-16 17:13:43 -04:00
Mike
df78402da8 Simplifies radio and language code checking 
Also moved the procs used to parse the codes into mob/say.dm to make it
easier for mobs that aren't carbon/humans to use language codes in the
future.
 2014-05-16 13:33:19 -04:00
Zuhayr
76c00a9f6e Removed vox snowflake crap from human breathing, expanded it out so that species datums will inform breathable gas, toxic gas and exhaled gas types. 2014-05-16 12:15:20 +09:30
Chinsky
8d1928c117 Merge pull request #4992 from Loganbacca/closetfix 
Closet wrapping fixes
 2014-05-16 05:42:31 +04:00
Loganbacca
78e0224649 Fixed resisting out of lockers 2014-05-15 23:03:21 +12:00
Zuhayr
081032372b Added a caching system for human icons. 2014-05-15 20:14:32 +09:30
Zuhayr
bab69d73ef Fixes another drone runtime, fff. 2014-05-15 19:12:12 +09:30
Zuhayr
7226486124 Fixing a bug with leap() and gut() 2014-05-15 15:09:48 +09:30
Zuhayr
8e76966357 Added species.sprite_sheets[] checks to human icon_update proc. 2014-05-15 14:55:13 +09:30
Zuhayr
a528a4db1f Split vox and vox armalis icons up into their own files. Set up species-level sprite files for vox and vox armalis. Removed icons/mob/vox.dmi. 2014-05-15 14:46:27 +09:30
Zuhayr
429684d5ac Squashed armalis/vox commits and human icon update commits: 
Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
 2014-05-15 14:30:37 +09:30
Mike
1c9a384a8d Cherrypick from 'ai-alarms' 
Refactoring and clean-up of alarm code for AI and robots.
 2014-05-14 20:20:30 -04:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
 2014-05-14 22:42:03 +01:00
Chinsky
98ee34a555 Merge pull request #4990 from Zuhayr/master 
Fixes #4810
 2014-05-14 15:00:23 +04:00
Loganbacca
86190c0edb Fix resisting out of closets 
- Removed do_after proc since it was hanging somewhere
 2014-05-14 21:54:49 +12:00
Zuhayr
e26d7fdb6f Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into dev 2014-05-14 17:12:26 +09:30
Zuhayr
be992ab9a7 Fixes drone fabricator runtime. 2014-05-14 17:12:03 +09:30
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
 2014-05-13 20:45:05 -04:00
Ccomp5950
a75defd96d Merge pull request #4975 from Zuhayr/nymphs 
Added a *chirp sound clip for diona nymphs.
 2014-05-12 22:14:20 -05:00
Zuhayr
681c7bbe53 Attempting to fix a bug involving resource stacks failing to appear when used. 2014-05-13 11:47:20 +09:30
Ccomp5950
5a1ab29c2a Merge pull request #4974 from Zuhayr/dev 
More more drone fixes.
 2014-05-12 20:26:05 -05:00
Zuhayr
2998ab3bd1 Adds inter-drone speak at close range (say) 2014-05-13 02:24:56 +09:30
Chinsky
7773de913d Merge pull request #4970 from Zuhayr/dev 
More drone fixes.
 2014-05-12 20:43:41 +04:00