cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 22:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,064 Commits 2 Branches 1 Tag
f1b77d0ed67cbc5097f0b51fee94b7f0538ebfd9
Commit Graph

6854 Commits

Author SHA1 Message Date
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
ZekeSulastin
3455bf7cc1 Add/remove beaker from sleeper for dialysis 
Redoes the sleeper attackby() prompt to match cryo's style.  Also
removes the millionbeaker in favor of a standard large.
 2013-10-19 17:03:13 -04:00
Nanai
752f9f80eb Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu 2013-10-19 13:13:02 -04:00
Segrain
cad425f2ca Roundend declaration. 2013-10-17 04:07:29 +03:00
Segrain
6184ad729f Cardfix. 2013-10-17 04:01:46 +03:00
Segrain
da96d45bc0 Smallfix. 2013-10-17 04:00:33 +03:00
Segrain
6ece0850af Volume fix. 2013-10-17 03:53:03 +03:00
Segrain
1d1d611087 Quillsfix. 2013-10-17 03:51:56 +03:00
Mloc
90378111e1 Fixes #3777 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-10-16 11:21:51 +01:00
Chinsky
a7be4d9353 Fixes #3781 
Magical thingies now go zzap instead of click click when empty.
 2013-10-16 11:06:43 +04:00
Chinsky
ac7aae7358 Fixed #3776 
Missed update_body calls
 2013-10-16 10:57:19 +04:00
DJSnapshot
4b8621bcef Temporary patch so aliums can use magboots until the hardsuit rework gets merged. 2013-10-15 23:06:02 -07:00
Chinsky
d85940ff3b Merge pull request #3775 from DJSnapshot/adminfeatures 
expanded mod powers
 2013-10-15 00:24:39 -07:00
DJSnapshot
3d83eafbae teensy spot missed. 2013-10-15 00:19:34 -07:00
DJSnapshot
8af4d1eadf Fixed random git bug 2013-10-15 00:14:21 -07:00
Chinsky
41377d4122 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-10-15 10:59:06 +04:00
Chinsky
7c681b2bd8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mob/new_player/new_player.dm
 2013-10-15 10:56:50 +04:00
DJSnapshot
c7821741c2 Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging. 2013-10-14 23:48:26 -07:00
Mloc
87037847ce Merge pull request #3773 from Aranclanos/EmitterBeams 
Duplicates the speed of the gameticker!
 2013-10-13 14:06:03 -07:00
Aranclanos
9af5c85c58 Duplicates the speed of the gameticker! 
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.

This will add lag due to everything being faster.
 2013-10-13 17:11:39 -03:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04:00
Segrain
bcba722bbd Fix for #3763. 2013-10-13 03:44:17 +03:00
Segrain
f725215857 Missing verbs. 2013-10-13 03:43:06 +03:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze 
freeze -> dev
 2013-10-11 11:41:06 -07:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions. 
- fixing the changelog
 2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage 
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
 2013-10-11 12:39:54 -04:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
3d6791df81 Fix for pockets. 2013-10-11 10:22:58 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
464fc22fa5 Missing verb. 2013-10-11 10:18:43 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
8be67352ea Typo fix. 2013-10-11 10:16:00 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Chinsky
7f62dfc5b1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/robot.dm
	code/setup.dm
 2013-10-10 14:30:34 +04:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts 
Fancy ghosts!
 2013-10-10 03:06:40 -07:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Chinsky
3c7c715e06 Merge pull request #3727 from fauxki/dev 
Dev - Lightswitches for Medbay / Beach Holodeck Update
 2013-10-08 21:23:42 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Chinsky
7555dd0f0b Merge branch 'master' into dev 
Conflicts:
	code/setup.dm
 2013-10-08 15:16:57 +04:00
Mloc-Argent
ebf2ba2d4a Fixes. 
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:35:26 +01:00
Mloc-Argent
a71f5ec322 Holding down Alt or Alt-Gr and clicking a tile will now bring up a stat panel with everything in that tile listed. 
Full credit goes to SuperSayu.
https://github.com/tgstation/-tg-station/pull/1402

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
Mloc-Argent
8b2c3fc153 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
Chinsky
463adc446f Fancy ghosts! 
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
 2013-10-06 16:10:47 +04:00
Chinsky
77d7cffa57 No idea why, but it caused all mobs spawn with deformed limbs. 2013-10-06 14:11:13 +04:00
Chinsky
9000854ddc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro 2013-10-06 14:10:20 +04:00
Mloc
c79f33b932 Merge pull request #3732 from comma/sideeffects 
Side Effects Strike Back
 2013-10-06 03:09:29 -07:00
Chinsky
f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro 
Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm
 2013-10-06 13:34:50 +04:00
Chinsky
e76721b6e8 Lowered immunity chance, it fires way too often with multiple viruses and such. 2013-10-06 13:25:23 +04:00