cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 08:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,444 Commits 2 Branches 1 Tag
33917763dfa7035428d23ec6eb4f759cb1518910
Commit Graph

7479 Commits

Author SHA1 Message Date
Zuhayr
19c41e3d75 Commenting out test ability stuff. 2013-12-01 15:12:11 +10:30
DJSnapshot
2203309fcc Merge pull request #4006 from Baystation12/master 
merge master into dev-freeze
 2013-11-30 15:22:31 -08:00
volas
e05b7f4341 brainmob fix: decapitated head is now really dead 2013-11-30 15:45:53 +04:00
volas
6841906228 Custom UI 2013-11-30 15:10:42 +04:00
Ccomp5950
0040a91b23 Ghost MedicHUD now actually checks for viruses. 
Thanks Chinsky for the tip!
 2013-11-30 01:56:13 -06:00
Ccomp5950
d039bea124 Ghostbuff, round 2. MedicalHUD 
Ghosts can now toggle a medical HUD
 2013-11-30 00:00:56 -06:00
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev 
Conflicts:
	icons/obj/ammo.dmi
 2013-11-30 05:15:22 +04:00
Chinsky
3e52d581a7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-30 05:12:06 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze 
Conflicts:
	html/changelog.html
 2013-11-30 05:11:36 +04:00
DJSnapshot
8813123997 added config flags for objectives being enabled or disabled. 
added antag options menu.
added ability to choose where a syndicate uplink is installed.
 2013-11-29 17:02:23 -08:00
Zuhayr
367cc3a827 Added skeleton code for mob abilities. 2013-11-30 00:02:05 +10:30
Chinsky
ca649d95aa Fixed issue with chopped off heads not having hair icons. 
Also threw in some eyecandy, limbs now turn at random angle (70 - 130) instead of straight 90.
 2013-11-29 16:13:45 +04:00
Zuhayr
d80edab619 Merge resolution. God damn the changelog. 2013-11-29 22:39:33 +10:30
Zuhayr
794ca4064e Merge resolution. 2013-11-29 22:36:36 +10:30
Zuhayr
9c4b4c2817 Merge resolution. 2013-11-29 22:34:09 +10:30
Mloc
f1672e2de0 Merge pull request #3987 from MrLeebo/dev 
Thanksgiving Update: Tofurkey!
 2013-11-29 03:10:10 -08:00
Ccomp5950
3be474bab8 Admin request: Added ability to jobban players from becoming Dionaea nymph 2013-11-28 22:35:12 -06:00
Iamgoofball
e02566fd2f Changes Telescience to Projectile Trajectory! 
Conflicts:
	code/modules/telesci/gps.dm
	code/modules/telesci/telesci_computer.dm
 2013-11-28 17:50:09 +04:00
Chinsky
6b23a0d7c0 Merge pull request #3982 from Mloc/bs12-hooks 
Implements hooks, an easier way to write code to be called at startup/roundstart/roundend/etc.
 2013-11-28 05:32:08 -08:00
Jeremy Liberman
6afa23a62e Adds tofurkey and stuffing food items 2013-11-28 03:45:13 -06:00
Chinsky
845a995abe Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/uniform.dmi
 2013-11-27 04:12:42 +04:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Zuhayr
aa6744344a Merge pull request #3976 from Ccomp5950/custom_items_buggaloo 
Custom Items.
 2013-11-25 13:47:43 -08:00
Mloc-Argent
6095a3a249 Merge branch 'dev' of github.com:Baystation12/Baystation12 into bs12-hooks 2013-11-25 21:17:07 +00:00
Mloc-Argent
33805e639b Implements hooks, an easier way to write code to be called at startup/roundstart/roundend. 
Current hooks are "startup", "roundstart", and "roundend".
Most stuff in world/New() has been moved over to the startup hook.
Roundstart and roundend have no hooks yet.

Removed the unused "newbanjob.dm" file and associated verbs/topics.
Bumped RECOMMENDED_VERSION up to 501.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-11-25 21:16:09 +00:00
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev" 
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
 2013-11-25 11:59:57 +00:00
Zuhayr
8b5664f321 Merge pull request #3975 from Ccomp5950/lasertag_suicide 
Can no longer commit suicide with a lasertag gun.
 2013-11-25 03:19:05 -08:00
Zuhayr
fa57b76f25 Merge pull request #3965 from jack-fractal/dev 
Mask of Nar'Sie - 1.0
 2013-11-24 20:57:04 -08:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2013-11-24 23:37:09 +00:00
Ccomp5950
cc5418b3cd Requested removal. 
Seth Sealis - Gray Coat
Ashley Rifler - Purple Glove

http://baystation12.net/forums/viewtopic.php?f=33&t=9097
 2013-11-24 16:57:18 -06:00
Ccomp5950
e8157e36f8 Custom Item Code: Sakura Hokkaido's Kimono (say that 3 times fast) 2013-11-24 16:51:30 -06:00
Ccomp5950
20b803b808 Custom Items Code: Yuri's Flask and Mai Yang's dres. 2013-11-24 16:28:48 -06:00
jack-fractal
39542c7760 - removing 'colon' use for proc calls. Generally a bad idea. 
- adding a check for being silenced to use runes
- adding extra slashes in front of the mask definition
- re-adding the autotransfer.dm file to the include list
 2013-11-24 16:13:28 -05:00
Ccomp5950
72b762db53 Can no longer commit suicide with a lasertag gun. 
And you will feel silly for even making the attempt.
 2013-11-23 21:51:15 -06:00
Ccomp5950
e684b69741 Fixed a runtime issue with demonsblood. Was causing runtimes because data was inheriting the bloods data var (which is a list). 
The drink will still maintain it's reagents and data vars but when ingested and procesed the blood is ignored.

Downsides, you can't get sick from ingesting blood in a drink (which..you shouldn't anywho)

Possible future updates:  since blood is an amnetic substance make the person have nausia for ingesting it if quantities are high
 2013-11-23 20:21:51 -06:00
Jeremy Liberman
6bd00eb561 Emag ATMs to drop money 2013-11-23 16:59:30 -06:00
jack-fractal
ce18d47778 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.int
	code/controllers/verbs.dm
 2013-11-23 11:58:50 -05:00
Mloc
c5cd3562e3 Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix 
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
 2013-11-23 04:02:40 -08:00
Ccomp5950
9e4e46cf44 Removed soda items from Booze dispenser 2013-11-23 04:49:02 -06:00
Zuhayr
471c45471e Fixes #3927 2013-11-23 21:08:52 +10:30
Zuhayr
b476a55b47 Fixes #3967 2013-11-23 20:52:39 +10:30
Ccomp5950
df7c877da7 Space Soda should now show up in the Soda Dispenser 2013-11-23 02:02:14 -06:00
Ccomp5950
3a177a95c4 And fix so Space Cola shows up too. 2013-11-23 01:50:17 -06:00
Ccomp5950
ec79e75c0f Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser 
Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.

Also removed my debug messages
 2013-11-23 01:43:34 -06:00
Ccomp5950
91c56c6e77 Fixed Booze dispensers and soda dispensers to be able to use glasses instead of beakers. 
Typo fix:  Added taquilla back in, it's ID wasn't correct in the reagent list for booze dispenser.

added watermellon juice to the soda machine.

Todo:  Fix NanoUI for these to now mention beakers, and have enough space to list watermellon juice
 2013-11-22 21:46:11 -06:00
Zuhayr
abd17deb5b Fixes #3962 2013-11-23 14:02:10 +10:30
Zuhayr
7cc1c93207 Clamps pill numbers between 1 and 20. 2013-11-23 13:47:20 +10:30
Zuhayr
6e2aa2e28a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:24 +10:30
Zuhayr
f359919623 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-23 13:21:11 +10:30