Kelenius
|
afbc235b96
|
Mob inventory cleanup
|
2016-03-15 16:39:40 +03:00 |
|
Zuhayr
|
a628ae2a56
|
Removed the Vox Pox.
|
2016-02-20 11:24:19 +10:30 |
|
Datraen
|
129965b1c4
|
Adds a variable to check for grenade loading, makes frags unloadable.
|
2016-02-16 12:58:17 -05:00 |
|
Zuhayr
|
7c3993b68b
|
Revert "Revert "Bay update.""
|
2016-02-07 16:33:30 +10:30 |
|
Zuhayr
|
98d983577c
|
Revert "Bay update."
|
2016-02-07 16:07:05 +10:30 |
|
Zuhayr
|
d5b904ca2a
|
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
|
2016-01-26 11:11:55 +10:30 |
|
Zuhayr
|
ab9574ee06
|
Fixing some infinite loops in gun update_icon() calls.
|
2016-01-22 04:27:00 +10:30 |
|
Zuhayr
|
e557a71fdc
|
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
|
2016-01-20 08:01:14 +10:30 |
|
Dibasic
|
6b77ec868e
|
antique laser description typo fix
there wasn't a period this adds a period
|
2016-01-16 18:02:41 -06:00 |
|
Mark9013100
|
a4b891f5ef
|
Replaces the standard .45 pistol with the Detective's.
|
2015-12-20 15:36:26 -05:00 |
|
PsiOmegaDelta
|
f382626075
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/asteroid.dm
code/game/verbs/ooc.dm
code/modules/admin/verbs/icarus.dm
code/modules/mob/living/silicon/robot/robot_items.dm
code/modules/projectiles/projectile/special.dm
code/modules/random_map/random_map.dm
code/setup.dm
|
2015-12-13 10:15:29 +01:00 |
|
SkyMarshal
|
d10118e3d0
|
Fixes #11346
Fixes #8123
Removes adminbus ability to call down the Icarus... because it's pretty broken.
|
2015-12-12 12:03:15 -07:00 |
|
Zuhayr
|
565e39a28f
|
Porting forensics from Aurora.
|
2015-12-10 19:16:28 +10:30 |
|
Neerti
|
c56e6d173c
|
Merge pull request #463 from Sabess/master
Added more reskins for the M1911 and some other stuff.
|
2015-12-08 08:15:19 -05:00 |
|
EmperorJon
|
2dc59a5c96
|
Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc
Changes 12mm to 10mm.
|
2015-12-07 23:59:50 +00:00 |
|
Jon
|
ef987c5124
|
Changes 12mm to 10mm.
|
2015-12-07 23:59:11 +00:00 |
|
sabess
|
7e0a8f9145
|
Fixed notes, oops
|
2015-12-07 18:31:53 +11:00 |
|
sabess
|
76a11a1fd0
|
Fixed stuff
|
2015-12-07 18:11:17 +11:00 |
|
sabess
|
47a6e38a8d
|
Added more reskins for the M1911, all of which have different sprites when empty. Added this functionality for the default M1911 as well as the default MK58s.
|
2015-12-07 14:25:06 +11:00 |
|
Neerti
|
e0986cb7ab
|
Ballistic weapons will now correctly say that the firing mode was changed.
|
2015-12-02 08:04:34 -05:00 |
|
Neerti
|
062a092cfe
|
Refactors how armor works. It's now less of a dice roll, but still retains some randomness. This makes weaker armor worth using, and stronger armor not godlike.
Also fixes a bug with the auto shotgun causing runtimes.
|
2015-12-01 03:45:47 -05:00 |
|
Neerti
|
5b59945032
|
Fixes gun aiming, adds logging for aiming and firing, and ballistic weapons should no longer be named 'the three round burst' or such.
|
2015-11-29 12:44:10 -05:00 |
|
Neerti
|
05ec2e7c28
|
Fixes gun mode switching.
|
2015-11-19 07:27:34 -05:00 |
|
Datraen
|
39d384cbe4
|
Makes Deckard's gun usable.
|
2015-10-14 19:05:14 -04:00 |
|
Mark9013100
|
ce4b21550a
|
Edits the Z8, L6, and A12
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
|
2015-10-11 00:44:47 -04:00 |
|
Mark9013100
|
0714ce3f93
|
Update automatic.dm
|
2015-10-11 00:44:22 -04:00 |
|
Mark9013100
|
fa361890ff
|
Minor change to the auto shotgun and SAW
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
icons/obj/rig_modules.dmi
|
2015-10-11 00:44:18 -04:00 |
|
Mark9013100
|
488ebc89b2
|
Balances fm-t2, nerfs burstfire
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
|
2015-10-11 00:42:26 -04:00 |
|
Mark9013100
|
3cc7a77846
|
The detective colt can now be reskinned
Conflicts:
code/modules/projectiles/guns/projectile/pistol.dm
|
2015-10-11 00:30:06 -04:00 |
|
Neerti
|
e52a0ea332
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
|
2015-10-10 23:17:26 -04:00 |
|
GinjaNinja32
|
c8eb26326a
|
Merge pull request #11208 from mwerezak/firemode-cleanup
Fixes #10850
|
2015-09-28 11:41:03 +01:00 |
|
mwerezak
|
13c184c2a8
|
Fixes #10850
|
2015-09-27 14:13:37 -04:00 |
|
Neerti
|
a9dda6cf3f
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
|
2015-09-06 18:26:06 -04:00 |
|
Neerti
|
3a5412df3a
|
Merge pull request #190 from PolarisSS13/master
Master to Dev 9/6/2015
|
2015-09-06 17:30:54 -04:00 |
|
Neerti
|
0451544692
|
Update nuclear.dm
|
2015-09-06 16:43:25 -04:00 |
|
Neerti
|
b93595c19f
|
Merge branch 'master' into 9/4/2015_master_to_dev
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
|
2015-09-04 08:43:37 -04:00 |
|
SinTwo
|
4e360779ed
|
Guns, Coats, and Hair Oh My
Hair gender fix, the attack of the multicolor labcoats and hoodies, and
the addition of a new SMG E-Gun.
|
2015-09-03 19:51:26 -04:00 |
|
PsiOmegaDelta
|
7bcf9aaea9
|
Merge pull request #10340 from comma/russian_roulette
Russian roulette and russian roulette accessories
|
2015-09-03 19:40:01 +02:00 |
|
Chinsky
|
28cf860332
|
Adds revolver spin sound.
|
2015-09-01 12:18:49 +03:00 |
|
Neerti
|
7fab70767d
|
colony-1 could not be saved, unfortunately. RIP
|
2015-08-23 18:04:47 -04:00 |
|
Neerti
|
00fa623c9d
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
|
2015-08-23 01:30:46 -04:00 |
|
mwerezak
|
4396e5a5bc
|
Merge pull request #9891 from Zuhayr/dev
Adds variables for CentComm, NanoTrasen and the station name.
|
2015-08-21 14:23:57 -04:00 |
|
Zuhayr
|
56131e1053
|
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
Conflicts:
code/modules/clothing/clothing.dm
|
2015-08-22 03:17:16 +09:30 |
|
Zuhayr
|
3c477dfa5e
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
code/game/jobs/access.dm
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
|
2015-08-22 03:11:53 +09:30 |
|
Zuhayr
|
bb82f80885
|
Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/organs/organ_icon.dm
|
2015-08-22 02:53:16 +09:30 |
|
Zuhayr
|
edf74e4721
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
code/modules/admin/topic.dm
|
2015-08-22 02:30:14 +09:30 |
|
Zuhayr
|
bf313ae238
|
Merge pull request #9851 from mwerezak/armourpen
Adds armor penetration system
|
2015-08-22 02:22:17 +09:30 |
|
Zuhayr
|
3bfa541612
|
Adds variables for CentComm, NanoTrasen and the station name.
|
2015-08-22 02:10:11 +09:30 |
|
Kelenius
|
bed03443d1
|
Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
|
2015-08-21 16:15:07 +03:00 |
|
SinTwo
|
9b51c352ae
|
AS-24 Fix #2 + ignore
Ignore hides database config for hopeful database fix(?)
|
2015-08-18 18:09:48 -04:00 |
|